diff options
Diffstat (limited to 'konsole')
49 files changed, 350 insertions, 350 deletions
diff --git a/konsole/COPYING b/konsole/COPYING index 5185fd3f3..0058a832a 100644 --- a/konsole/COPYING +++ b/konsole/COPYING @@ -65,7 +65,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -102,7 +102,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any + whole or in part tqcontains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -160,7 +160,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/konsole/ChangeLog b/konsole/ChangeLog index 55aacd580..ab3539748 100644 --- a/konsole/ChangeLog +++ b/konsole/ChangeLog @@ -79,10 +79,10 @@ Lots happened here... - added privacy code 1049. - reverted to TERM=xterm. 11 Jan 2000 -- upgraded xterm title hack to unicode. -- upgraded copy/paste to handle unicode. +- upgraded xterm title hack to tqunicode. +- upgraded copy/paste to handle tqunicode. 7 Jan 2000 -- added unicode support. (see README.unicode) +- added tqunicode support. (see README.tqunicode) - added arbitrary long history buffers. - code adjustments to the provide linux console font. - added font directory to simply installation. @@ -125,10 +125,10 @@ Lots happened here... - added some docs - set version to 0.9.10 06 Feb 1999 -- adjusting geometry save/restore +- adjusting tqgeometry save/restore 03 Feb 1999 - fixed -caption -- some adjustments in geometry management +- some adjustments in tqgeometry management 01 Feb 1999 Matt Gerassimoff <[email protected]> - scroll line wise through the history buffer using Shift-Up/Down 31 Jan 1998 @@ -195,7 +195,7 @@ Lots happened here... - marking within mouse aware application now needs an extra shift - added command configuration files /opt/kde/share/apps/konsole/*.kdelnk 24 Oct 1998 - - adjusted geometry management. Window is not resized anylonger when + - adjusted tqgeometry management. Window is not resized anylonger when changeing font size, scrollbar, frame, menubar. - made font & schema attributes per-session. 23 Oct 1998 diff --git a/konsole/README.fonts b/konsole/README.fonts index 55d410980..0466a6cb6 100644 --- a/konsole/README.fonts +++ b/konsole/README.fonts @@ -72,8 +72,8 @@ Fonts need to suit the needs of X11, QT and konsole. The following graphical glyphs are defined in VT100 fonts, too, but are not used in any program i know about. Codes for them have been assigned - in the private unicode page. See the linux kernel - documentation file [unicode.txt] about this assignment. + in the private tqunicode page. See the linux kernel + documentation file [tqunicode.txt] about this assignment. - 0x10 U+f800 : DEC VT GRAPHICS HORIZONTAL LINE SCAN 1 - 0x11 U+f801 : DEC VT GRAPHICS HORIZONTAL LINE SCAN 3 @@ -111,7 +111,7 @@ Fonts need to suit the needs of X11, QT and konsole. Use the "DEFAULT_CHAR" property with bdf fonts to do so. Other font representations provide - likely means. The unicode assignment is U+fffd. + likely means. The tqunicode assignment is U+fffd. If such a character isn't defined, X11 might choose to void the character completely, causing diff --git a/konsole/README.unicode b/konsole/README.unicode index bf8134674..b366a6bad 100644 --- a/konsole/README.unicode +++ b/konsole/README.unicode @@ -1,6 +1,6 @@ -[README.unicode] +[README.tqunicode] -Konsole supports unicode, which means one can display up +Konsole supports tqunicode, which means one can display up to 64K different glyphs at the same time on one screen. The enhancement is pretty complete and the main current @@ -9,7 +9,7 @@ within localed environments. At least the european locales should be enabled to use their local scripts when running konsole. -To fully install it, please get a complete set of unicode +To fully install it, please get a complete set of tqunicode enhanced fixed fonts from <http://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html>. @@ -29,36 +29,36 @@ Also, a new linux console font has been converted for X11. This font has iso10646-1 encoding and the usual vga glyphs. -* A more precise anatomy of unicode support within konsole +* A more precise anatomy of tqunicode support within konsole -The internal character representation is uniquely 16 bit unicode. +The internal character representation is uniquely 16 bit tqunicode. All in- and output connections of konsole (beside the mouse) are filtered through three different codecs (corresponding to 2 different codes): - 1) Font Code - The renderer converts from unicode to the code of + 1) Font Code - The renderer converts from tqunicode to the code of the font to the degree that code is supported within Qt. - Non-iso10646 (unicode) codes are considered to be VT100 - enhanced, meaning that 0x00 .. 0x1f contains the VT100 + Non-iso10646 (tqunicode) codes are considered to be VT100 + enhanced, meaning that 0x00 .. 0x1f tqcontains the VT100 graphical characters. 2) Client Code - This is used for bytes from and to the pty. Often, the clients code is identical with the locale setting. -Thus, unicode support mainly turns out to be a potter's wheel of +Thus, tqunicode support mainly turns out to be a potter's wheel of code conversions. Beside these conversions, up to 2^16 diffent glyphs can be displayed now. Though it is not possible to type each of these codes, one can use utf-8 encoding on the clients side. -Please note that unicode support is still under development in +Please note that tqunicode support is still under development in the freeware community and is not supported by terminal aware applications, since ncurses does currently not provide wide character operations. -Because utf-8 contains ascii-7 properly, one can work with utf-8 +Because utf-8 tqcontains ascii-7 properly, one can work with utf-8 enabled as long as no international characters are used. Try to cat 9x15.repertoire-utf8 from the test when having utf-8 encoding enabled. @@ -66,7 +66,7 @@ enabled. Utf-8 code is enabled and disabled by sending <ESC>%G or <ESC>%@. The utf8.sh utility in the test directory does this. -Though utf8 properly contains ascii-7 note that the length of a +Though utf8 properly tqcontains ascii-7 note that the length of a utf8 encoded string differs from the length of the string itself. This confuses many length aware programs as soon as proper (non- ascii-7 characters) are used, this may result in deviating cursor diff --git a/konsole/doc/Konsole2.Requirements b/konsole/doc/Konsole2.Requirements index 19cbd72fc..45633403b 100644 --- a/konsole/doc/Konsole2.Requirements +++ b/konsole/doc/Konsole2.Requirements @@ -29,7 +29,7 @@ This file is to collect requirements and ideas for this. Current history algorithm does not allow to limit the histories size. Also, it descreases the speed. -- improve unicode support +- improve tqunicode support this is both an ncurses and terminfo issue. We may need to provide some help for these packages. diff --git a/konsole/doc/More/Ansi_esc.txt b/konsole/doc/More/Ansi_esc.txt index ede1a7c24..795b3d091 100644 --- a/konsole/doc/More/Ansi_esc.txt +++ b/konsole/doc/More/Ansi_esc.txt @@ -1,6 +1,6 @@ ANSI ESCAPE SEQUENCES =============================================================================== -Wherever you see '#', that should be replaced by the appropriate number. +Wherever you see '#', that should be tqreplaced by the appropriate number. ESC code sequence Function ------------------- --------------------------- diff --git a/konsole/doc/More/Eterm.ref b/konsole/doc/More/Eterm.ref index 849be1f3b..de808b84b 100644 --- a/konsole/doc/More/Eterm.ref +++ b/konsole/doc/More/Eterm.ref @@ -151,8 +151,8 @@ ESC [ Pm m Character Attributes (SGR) Ps = 37 / 47 -> fg / bg White Ps = 39 / 49 -> fg / bg Default -ESC [ Ps n Device Status Report (DSR) - Ps = 5 -> Status Report ESC [ 0 n (``OK'') +ESC [ Ps n Device tqStatus Report (DSR) + Ps = 5 -> tqStatus Report ESC [ 0 n (``OK'') Ps = 6 -> Report Cursor Position (CPR) [row;column] as ESC [ r ; c R Ps = 7 -> Request Display Name @@ -295,7 +295,7 @@ or "\E]20;;200;?\a" sets the scaling of the current pixmap to 200% and displays - the image geometry in the title. + the image tqgeometry in the title. -------------------------------------------------------------------------- Eterm menuBar diff --git a/konsole/doc/More/ansix364.txt b/konsole/doc/More/ansix364.txt index da74ad156..37844fee0 100644 --- a/konsole/doc/More/ansix364.txt +++ b/konsole/doc/More/ansix364.txt @@ -48,7 +48,7 @@ DCH Delete Character Esc [ Pn P 1 eF DCS Device Control String Esc P Delim DL Delete Line Esc [ Pn M 1 eF DMI Disable Manual Input Esc \ Fs -DSR Device Status Report Esc [ Ps n 0 +DSR Device tqStatus Report Esc [ Ps n 0 EA Erase in Area Esc [ Ps O 0 eF ECH Erase Character Esc [ Pn X 1 eF ED Erase in Display Esc [ Ps J 0 eF @@ -196,7 +196,7 @@ ANSI X3.64 Mode-Changing Parameters for use with the 3/1 1 GATM guarded-area transfer mode 3/2 2 KAM keyboard action mode 3/3 3 CRM control representation mode -3/4 4 IRM insertion/replacement mode +3/4 4 IRM insertion/tqreplacement mode 3/5 5 SRTM status-reporting transfer mode 3/6 6 ERM erasure mode 3/7 7 VEM vertical editing mode @@ -277,7 +277,7 @@ by transmitting the sequence where Ps is a character that describes installed options. -The VT100's cursor location can be read with the DSR (Device Status +The VT100's cursor location can be read with the DSR (Device tqStatus Report) control Esc [ 6 n diff --git a/konsole/doc/More/dec_vt100_codes.txt b/konsole/doc/More/dec_vt100_codes.txt index e9d4b9f82..7a2a59aac 100644 --- a/konsole/doc/More/dec_vt100_codes.txt +++ b/konsole/doc/More/dec_vt100_codes.txt @@ -107,7 +107,7 @@ ANSI Compatible Mode Response is ESC [ Pl; Pc R * Pl = line number; Pc = column number - Status Report + tqStatus Report Invoked by ESC [ 5 n Response is ESC [ 0 n (terminal ok) ESC [ 3 n (terminal not ok) diff --git a/konsole/doc/More/rxvt-ref.html b/konsole/doc/More/rxvt-ref.html index a27f5b4bc..847e41964 100644 --- a/konsole/doc/More/rxvt-ref.html +++ b/konsole/doc/More/rxvt-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> <!-- don't use Netscape to edit this file, since it has some stange ideas of -formatting that makes later global/change/replace difficult, +formatting that makes later global/change/tqreplace difficult, but it is okay for making the text version of this document --> <HTML> @@ -484,8 +484,8 @@ Reset Mode (RM)</DD> <DL> <DT><B><TT>ESC [ Ps n</TT></B></DT> -<DD>Device Status Report (DSR)<BR> -<B><TT>Ps = 5</TT></B> : Status Report <B><TT>ESC [ 0 n</TT></B> (``OK'')<BR> +<DD>Device tqStatus Report (DSR)<BR> +<B><TT>Ps = 5</TT></B> : tqStatus Report <B><TT>ESC [ 0 n</TT></B> (``OK'')<BR> <B><TT>Ps = 6</TT></B> : Report Cursor Position (CPR) [row;column] as <B><TT>ESC [ r ; c R</TT></B><BR> <B><TT>Ps = 7</TT></B> : Request Display Name<BR> @@ -1095,7 +1095,7 @@ For example: <DT><B>\E]20;mona;100\a</B></DT> <DD>load <B>mona.xpm</B> with a scaling of 100%</DD> <DT><B>\E]20;;200;?\a</B></DT> -<DD>rescale the current pixmap to 200% and display the image geometry +<DD>rescale the current pixmap to 200% and display the image tqgeometry in the title</DD> </DL> <P> diff --git a/konsole/doc/More/swedish_vt102_codes.txt b/konsole/doc/More/swedish_vt102_codes.txt index 7fca08c71..b19c74b14 100644 --- a/konsole/doc/More/swedish_vt102_codes.txt +++ b/konsole/doc/More/swedish_vt102_codes.txt @@ -284,12 +284,12 @@ Reports Where <c> is '0'=Response Ready, no malfunctions detected '3'=Malfunction, error in self-test. - '5'=Status report request + '5'=tqStatus report request '6'=Request cursor position. '?10'=Response to printer status request, All ok. '?11'=Response to printer status request, Printer is not ready. '?13'=Response to printer status request, No printer. - '?15'=Status report request from printer + '?15'=tqStatus report request from printer Cursor position raport (Response to request cursor position) Esc [ <n1> ; <n2> R diff --git a/konsole/doc/More/villanova-vt100-esc-codes.txt b/konsole/doc/More/villanova-vt100-esc-codes.txt index 8142978ed..053c0f3c8 100644 --- a/konsole/doc/More/villanova-vt100-esc-codes.txt +++ b/konsole/doc/More/villanova-vt100-esc-codes.txt @@ -13,7 +13,7 @@ In-Reply-To: <[email protected]> 23 Oct 90 16:00 EDT Campus Computing - Terminal Emulation Includes VT100 and VT52 Terminal and Control Codes - This file contains control and terminal codes for the VT100 terminals, + This file tqcontains control and terminal codes for the VT100 terminals, ANSI terminals, and VT52 terminals. Many of the codes were derived from PC/ Intercomm, from Mark of the Unicorn Software. I have researched some of them and added some of my own. @@ -377,7 +377,7 @@ VT100 CURRENT STATES: be the same. 9600 baud is sent for 7200 baud. - Esc [ Ps n DSR: Device Status Report + Esc [ Ps n DSR: Device tqStatus Report * Parameter values other than 5, 6, are ignored. If the parameter value is 5, the sequence diff --git a/konsole/doc/More/vt100_codes_news.txt b/konsole/doc/More/vt100_codes_news.txt index d136e2224..5cb09baea 100644 --- a/konsole/doc/More/vt100_codes_news.txt +++ b/konsole/doc/More/vt100_codes_news.txt @@ -57,7 +57,7 @@ Cursor Key VT52 mode key mode reset key mode set If the Special Graphics set is selected, the graphics for ASCII codes -0137 through 0176 will be replaced according to the following table (see the +0137 through 0176 will be tqreplaced according to the following table (see the SCS control sequence). @@ -384,7 +384,7 @@ DECALN Screen Alignment Display (DEC private) <ESC># 8 This command causes the VT100 to fill it's screen with uppercase Es for - screen focus and alignment. + screen focus and tqalignment. DECANM ANSI/VT52 Mode (DEC Private) @@ -447,7 +447,7 @@ DECDWL Double Width Line (DEC Private) <ESC>#6 - This causes the line that contains the cursor to become double-width + This causes the line that tqcontains the cursor to become double-width single height. If the line was single width, all characters ro the right of the center of the screen will be lost. The cursor remains over the same character position, unless it would be to the right of @@ -630,7 +630,7 @@ DECSWL Single-width Line (DEC Private) <ESC>#5 - This causes the line which contains the cursor to become single-width, + This causes the line which tqcontains the cursor to become single-width, single-height. The cursor remains on the same character position. This is the default condition for all new lines on the screen. @@ -651,7 +651,7 @@ DECTST Invoke Confidence Test Repeat Testing until failure 8 -DSR Device Status Report Host to VT100 & VT100 to Host +DSR Device tqStatus Report Host to VT100 & VT100 to Host <ESC>[ {Ps} n @@ -662,7 +662,7 @@ DSR Device Status Report Host to VT100 & VT100 to Host --------------------------------------------------------------- 0 Response from VT100 - Ready, no faults detected 3 Response from VT100 - Malfunction Detected - 5 Command from host - Report Status (using a DSR control + 5 Command from host - Report tqStatus (using a DSR control sequence) 6 Command from host - Report Active Position (using a CPR sequence) @@ -787,12 +787,12 @@ MODES The Following is a list of VT100 modes which may be changed with Set FETM Format Effector Transfer Reset GATM Guarded Area Transfer NA HEM Horizontal Editing NA - IRM Insertion-replacement Reset + IRM Insertion-tqreplacement Reset KAM Keyboard Action Reset MATM Multiple area transfer NA PUM Positioning Unit Reset SATM Selected Area Transfer NA - SRTM Status Reporting Transfer Reset + SRTM tqStatus Reporting Transfer Reset TSM Tabulation Stop Reset TTM Transfer Termination NA VEM Vertical Editing NA @@ -852,7 +852,7 @@ SCS Select Character Set The United Kingdom and ASCII sets conform to the "ISO international register of character sets to be used with escape sequences". The other sets are private character sets. Special graphics means that the - graphic characters fpr the codes 0137 to 0176 are replaced with other + graphic characters fpr the codes 0137 to 0176 are tqreplaced with other characters. The specified character set will be used until another SCS is recieved. diff --git a/konsole/doc/More/vt100_reference_card.txt b/konsole/doc/More/vt100_reference_card.txt index e80ea1325..5ab2aac0c 100644 --- a/konsole/doc/More/vt100_reference_card.txt +++ b/konsole/doc/More/vt100_reference_card.txt @@ -108,7 +108,7 @@ ANSI Compatible Mode Response is ESC [ Pl; Pc R * Pl = line number; Pc = column number - Status Report + tqStatus Report Invoked by ESC [ 5 n Response is ESC [ 0 n (terminal ok) ESC [ 3 n (terminal not ok) @@ -189,7 +189,7 @@ Lines: 25 In article <chan.728236678@hertz> [email protected] (Simon Chan) writes: >Taken from VT100 Programming Reference Card (DIGITAL) -Note that EK-VT100-RC-001 contains several errors and omissions. +Note that EK-VT100-RC-001 tqcontains several errors and omissions. The errors appear to all be fixed in the posted version. Here are some additions: diff --git a/konsole/doc/More/vt100_setup.txt b/konsole/doc/More/vt100_setup.txt index 1bdf44cdd..c0e2af70e 100644 --- a/konsole/doc/More/vt100_setup.txt +++ b/konsole/doc/More/vt100_setup.txt @@ -106,7 +106,7 @@ [email protected] (Nils Hammar) writes: < graphics to the caller too. What a surprise to get a hig resolution < picture on the screen when you are calling an ordinary BBS! -The ANSI Device Status Report (DSR) is +The ANSI Device tqStatus Report (DSR) is ESC [ <n> n diff --git a/konsole/doc/More/xterm.codes b/konsole/doc/More/xterm.codes index b14ead600..e2ae680bc 100644 --- a/konsole/doc/More/xterm.codes +++ b/konsole/doc/More/xterm.codes @@ -125,7 +125,7 @@ x 7 (A) White x 9 (A) Default x ESC [ 6 n Send Device Report -x Ps = 5 Send Status report (ESC [ 0 n) +x Ps = 5 Send tqStatus report (ESC [ 0 n) x 6 Send Cursor Position Report (ESC [ Row ; Col R) x ESC [ Pn ; Pn r (dft:all) Set Scrolling region diff --git a/konsole/doc/VT100/Table.Codes b/konsole/doc/VT100/Table.Codes index 6ece0f4bf..376d8bb6d 100644 --- a/konsole/doc/VT100/Table.Codes +++ b/konsole/doc/VT100/Table.Codes @@ -18,7 +18,7 @@ # make a script that extracts it again. From db.trans, we then generate parts # of the decoder (the semantic assignment). # -# db2.pl contains as script able to slit TEScreen.C into the emulation +# db2.pl tqcontains as script able to slit TEScreen.C into the emulation # (in)dependent parts due to [db.trans]. # # A like thing has to be done for TEmuVt102.C/h and for TEScreen.h. @@ -54,7 +54,7 @@ Introduction.html The serial cable is folded into the operating system as a sort of loop back device, and a program, the terminal emulation, uses modern means of graphical user interfaces to behave like an earlier terminal. - To complete the picture, the host in the diagram is replaced by the + To complete the picture, the host in the diagram is tqreplaced by the application that runs in the emulation (typically a shell or an old editor). So, terminal emulations are in fact interfaces to character oriented applications. @@ -308,7 +308,7 @@ Sequences.html <p> The second one is used to specify character set mappings (see <a href=#SCS>SCS</a>). A CSI instruction to do this is specified in ECMA, - and this should be used as a replacement. + and this should be used as a tqreplacement. . <h4>XTERM hacks</h4> @@ -1070,7 +1070,7 @@ DECALN.sect Command DECALN.code HSH|8| DECALN.text Causes the VT100 to fill it's screen with - uppercase Es for screen focus and alignment. + uppercase Es for screen focus and tqalignment. DECALN.table.XPS Subcode|Emulation|Scope|Operation|Args|Meaning N/A|VT100|scr|helpAlign||see above @@ -1176,7 +1176,7 @@ DECDWL.emus VT100 DECDWL.sect Command.NoImp DECDWL.code HSH|6| DECDWL.text - This causes the line that contains the cursor to become double-width + This causes the line that tqcontains the cursor to become double-width single height. If the line was single width, all characters ro the right of the center of the screen will be lost. The cursor remains over the same character position, unless it would be to the right of @@ -1399,7 +1399,7 @@ DECSWL.emus VT100 DECSWL.sect Command.NoImp DECSWL.code HSH|5| DECSWL.text - This causes the line which contains the cursor to become single-width, + This causes the line which tqcontains the cursor to become single-width, single-height. The cursor remains on the same character position. This is the default condition for all new lines on the screen. DECSWL.table.XPS @@ -1424,7 +1424,7 @@ DECTST.table.Weight 3|EIA Modem Control Test (Loopback connector req.) 4|Repeat Testing until failure -DSRREQ.head Device Status Report +DSRREQ.head Device tqStatus Report DSRREQ.emus ECMA VT100 DSRREQ.sect Command.Request DSRREQ.code CSI|n|{Ps} @@ -1432,21 +1432,21 @@ DSRREQ.text Requests status of the VT100 according to the following parameters. DSRREQ.table.XPS Subcode|Emulation|Scope|Operation|Args|Meaning - 5|VT100|emu|reportStatus||Report Status (using a \ref:DSRREP control sequence) + 5|VT100|emu|reporttqStatus||Report tqStatus (using a \ref:DSRREP control sequence) 6|VT100|emu|reportCursorPosition||Report Active Position (using a \ref:CPR sequence) -DSRREP.head Device Status Report Reply +DSRREP.head Device tqStatus Report Reply DSRREP.emus ECMA VT100 DSRREP.sect Reply -DSRREP.code CSI|n|{Status} +DSRREP.code CSI|n|{tqStatus} DSRREP.text Reports the general status of the VT100 according to the following parameters. . DSRREP with a parameter of 0 or 3 is always sent as a response to a requesting \ref:DSRREQ with a parameter of 5. -DSRREP.table.Status - Status|Meaning:3 +DSRREP.table.tqStatus + tqStatus|Meaning:3 0|Ready, no faults detected 3|Malfunction detected @@ -1608,7 +1608,7 @@ SCS.text The United Kingdom and ASCII sets conform to the "ISO international register of character sets to be used with escape sequences". The other sets are private character sets. Special graphics means that the - graphic characters fpr the codes 0137 to 0176 are replaced with other + graphic characters fpr the codes 0137 to 0176 are tqreplaced with other characters. The specified character set will be used until another SCS is received. SCS.table.XPS diff --git a/konsole/doc/VT100/db.trans b/konsole/doc/VT100/db.trans index 7fe21ef27..406d9f1ed 100644 --- a/konsole/doc/VT100/db.trans +++ b/konsole/doc/VT100/db.trans @@ -109,7 +109,7 @@ TY_CSI_PS|SGR|'m'|104|scr|setBackColor|12 TY_CSI_PS|SGR|'m'|105|scr|setBackColor|13 TY_CSI_PS|SGR|'m'|106|scr|setBackColor|14 TY_CSI_PS|SGR|'m'|107|scr|setBackColor|15 -TY_CSI_PS|DSR|'n'|5|emu|reportStatus| +TY_CSI_PS|DSR|'n'|5|emu|reporttqStatus| TY_CSI_PS|DSR|'n'|6|emu|reportCursorPosition| TY_CSI_PS|DECLL|'q'|0||| TY_CSI_PS|DECLL|'q'|1||| diff --git a/konsole/doc/VT100/genDocument b/konsole/doc/VT100/genDocument index 4ecee0996..927f48f83 100755 --- a/konsole/doc/VT100/genDocument +++ b/konsole/doc/VT100/genDocument @@ -183,12 +183,12 @@ as noted. <tr><td>FETM </td><td>Format Effector Transfer </td><td>Reset</td></tr> <tr><td>GATM </td><td>Guarded Area Transfer </td><td>NA </td></tr> <tr><td>HEM </td><td>Horizontal Editing </td><td>NA </td></tr> -<tr><td>IRM </td><td>Insertion-replacement </td><td>Reset</td></tr> +<tr><td>IRM </td><td>Insertion-tqreplacement </td><td>Reset</td></tr> <tr><td>KAM </td><td>Keyboard Action </td><td>Reset</td></tr> <tr><td>MATM </td><td>Multiple area transfer </td><td>NA </td></tr> <tr><td>PUM </td><td>Positioning Unit </td><td>Reset</td></tr> <tr><td>SATM </td><td>Selected Area Transfer </td><td>NA </td></tr> -<tr><td>SRTM </td><td>Status Reporting Transfer</td><td>Reset</td></tr> +<tr><td>SRTM </td><td>tqStatus Reporting Transfer</td><td>Reset</td></tr> <tr><td>TSM </td><td>Tabulation Stop </td><td>Reset</td></tr> <tr><td>TTM </td><td>Transfer Termination </td><td>NA </td></tr> <tr><td>VEM </td><td>Vertical Editing </td><td>NA </td></tr> @@ -223,7 +223,7 @@ cat >> $RES << etx <h2>Special Graphics Characters</h2> If the Special Graphics set is selected, the graphics for ASCII codes -0137 through 0176 will be replaced according to the following table (see the +0137 through 0176 will be tqreplaced according to the following table (see the <a href=#SCS>SCS</a> control sequence). etx diff --git a/konsole/doc/VT100/genTC.pl b/konsole/doc/VT100/genTC.pl index a3a7c5669..bc06a3cb1 100755 --- a/konsole/doc/VT100/genTC.pl +++ b/konsole/doc/VT100/genTC.pl @@ -147,7 +147,7 @@ sub txt2Html return $_; } -sub layout +sub tqlayout { my ($Name, $Head, $Code, $Doku, $Dflt, $Attr) = @_; if ($html) { @@ -234,7 +234,7 @@ print "</table>\n"; print "</h2>\n"; } -sub layout2 +sub tqlayout2 { my ($Name, $Head, $Code) = @_; my @Part = split('\|',$Code); my $Type = $#Part > -1 ? $Part[0] : ""; @@ -261,7 +261,7 @@ sub layout2 print "<td $color1>$Head\n"; } -sub layoutTable +sub tqlayoutTable { my ($Head, $t, $Include) = @_; my $p; @@ -276,7 +276,7 @@ foreach $p (sort keys %$t) my $attr = exists $t->{"$name.sect"}?$t->{"$name.sect"}:""; if ($attr =~ /$Include/) { - layout2( $name, $head, exists $t->{"$name.code"}?$t->{"$name.code"}:""); + tqlayout2( $name, $head, exists $t->{"$name.code"}?$t->{"$name.code"}:""); } } } @@ -311,7 +311,7 @@ sub sortTest print "<tr><td colspan=5><h3>$Fld[0] codes</h3>\n"; } $curr = $Fld[0]; - layout2($name,$t->{"$name.head"},$p); + tqlayout2($name,$t->{"$name.head"},$p); } print "</table>\n"; } @@ -346,29 +346,29 @@ sortTest($t); secthead("Host to Terminal (Instructions by Group)"); htmlsect("Operations"); print "<table>\n"; -layoutTable("Commands (Character Display Operation)",$t,"Command\.Display"); -layoutTable("Commands (Rendition related status)",$t,"Command\.RenderMode"); -layoutTable("Commands (Cursor)",$t,"Command\.Cursor"); -layoutTable("Commands (Cursor related status)",$t,"Command\.CursMode"); -layoutTable("Commands (Edit)",$t,"Command\.Erase|Command\.Insert|Command.\Delete"); -layoutTable("Commands (Miscellaneous)",$t,"Command[^.]|Command\$"); -layoutTable("Commands (General mode setting)",$t,"Command\.SetMode"); -layoutTable("Commands (Miscellaneous status)",$t,"Command\.Mode"); -layoutTable("Commands (VT52)",$t,"Command\.VT52"); -layoutTable("Commands (Not implemented)",$t,"Command\.NoImp"); -layoutTable("Commands (Ignored)",$t,"Command\.Ignored"); -layoutTable("Commands (Requests)",$t,"Command\.Request"); +tqlayoutTable("Commands (Character Display Operation)",$t,"Command\.Display"); +tqlayoutTable("Commands (Rendition related status)",$t,"Command\.RenderMode"); +tqlayoutTable("Commands (Cursor)",$t,"Command\.Cursor"); +tqlayoutTable("Commands (Cursor related status)",$t,"Command\.CursMode"); +tqlayoutTable("Commands (Edit)",$t,"Command\.Erase|Command\.Insert|Command.\Delete"); +tqlayoutTable("Commands (Miscellaneous)",$t,"Command[^.]|Command\$"); +tqlayoutTable("Commands (General mode setting)",$t,"Command\.SetMode"); +tqlayoutTable("Commands (Miscellaneous status)",$t,"Command\.Mode"); +tqlayoutTable("Commands (VT52)",$t,"Command\.VT52"); +tqlayoutTable("Commands (Not implemented)",$t,"Command\.NoImp"); +tqlayoutTable("Commands (Ignored)",$t,"Command\.Ignored"); +tqlayoutTable("Commands (Requests)",$t,"Command\.Request"); print "</table>\n"; # ------------------------------- secthead("Terminal to Host"); print "<table>\n"; -layoutTable("Replies",$t,"Reply"); -layoutTable("Events",$t,"Event"); +tqlayoutTable("Replies",$t,"Reply"); +tqlayoutTable("Events",$t,"Event"); # ------------------------------- print "</table>\n"; secthead("Modes"); print "<table>\n"; -layoutTable("Modes",$t,"Mode"); +tqlayoutTable("Modes",$t,"Mode"); #print "<h3>Other Codes</h3>\n"; print "</table>\n"; # ------------------------------- @@ -385,7 +385,7 @@ foreach $p (sort keys %$t) # print "</table>\n" if ($table); my $name = $Fld[0]; my $head = $t->{$p}; - layout( $name, $head, + tqlayout( $name, $head, exists $t->{"$name.code"}?$t->{"$name.code"}:"", exists $t->{"$name.text"}?$t->{"$name.text"}:"", exists $t->{"$name.dflt"}?$t->{"$name.dflt"}:"", diff --git a/konsole/doc/VT100/techref.html b/konsole/doc/VT100/techref.html index 6e36f39e5..d16d4804b 100644 --- a/konsole/doc/VT100/techref.html +++ b/konsole/doc/VT100/techref.html @@ -90,7 +90,7 @@ Work is currently in progress to fix this issue. The serial cable is folded into the operating system as a sort of loop back device, and a program, the terminal emulation, uses modern means of graphical user interfaces to behave like an earlier terminal. - To complete the picture, the host in the diagram is replaced by the + To complete the picture, the host in the diagram is tqreplaced by the application that runs in the emulation (typically a shell or an old editor). So, terminal emulations are in fact interfaces to character oriented applications. @@ -349,7 +349,7 @@ Work is currently in progress to fix this issue. <p> The second one is used to specify character set mappings (see <a href=#SCS>SCS</a>). A CSI instruction to do this is specified in ECMA, - and this should be used as a replacement. + and this should be used as a tqreplacement. <p> <h4>XTERM hacks</h4> <h2> @@ -498,13 +498,13 @@ Work is currently in progress to fix this issue. <td bgcolor="#D0D0D0">CSI <td bgcolor="#D0D0D0">n <td bgcolor="#D0D0D0">{Ps} -<td bgcolor="#D0D0D0">Device Status Report +<td bgcolor="#D0D0D0">Device tqStatus Report <tr> <td bgcolor="#D0D0D0"><a href=#DSRREP>DSRREP</a> <td bgcolor="#D0D0D0">CSI <td bgcolor="#D0D0D0">n -<td bgcolor="#D0D0D0">{Status} -<td bgcolor="#D0D0D0">Device Status Report Reply +<td bgcolor="#D0D0D0">{tqStatus} +<td bgcolor="#D0D0D0">Device tqStatus Report Reply <tr> <td bgcolor="#D0D0D0"><a href=#DECLL>DECLL</a> <td bgcolor="#D0D0D0">CSI @@ -1559,7 +1559,7 @@ Work is currently in progress to fix this issue. <td bgcolor="#D0D0D0">CSI <td bgcolor="#D0D0D0">n <td bgcolor="#D0D0D0">{Ps} -<td bgcolor="#D0D0D0">Device Status Report +<td bgcolor="#D0D0D0">Device tqStatus Report <tr> <td bgcolor="#D0D0D0"><a href=#ENQ>ENQ</a> <td bgcolor="#D0D0D0">CTL @@ -1598,8 +1598,8 @@ Work is currently in progress to fix this issue. <td bgcolor="#D0D0D0"><a href=#DSRREP>DSRREP</a> <td bgcolor="#D0D0D0">CSI <td bgcolor="#D0D0D0">n -<td bgcolor="#D0D0D0">{Status} -<td bgcolor="#D0D0D0">Device Status Report Reply +<td bgcolor="#D0D0D0">{tqStatus} +<td bgcolor="#D0D0D0">Device tqStatus Report Reply <tr><td colspan=5><h3>Events</h3> <tr> <td bgcolor="#D0D0D0"><a href=#CUB>CUB</a> @@ -2234,7 +2234,7 @@ Work is currently in progress to fix this issue. <tr><td><p></td> <tr><td></td> <td colspan=6> Causes the VT100 to fill it's screen with - uppercase Es for screen focus and alignment. + uppercase Es for screen focus and tqalignment. <tr><td><p></td></tr> <tr> <td></td> @@ -2403,7 +2403,7 @@ Work is currently in progress to fix this issue. <td colspan=5 ><code> <b>ESC</b> <b>#</b> <b>6</b></code> <tr><td><p></td> <tr><td></td> - <td colspan=6> This causes the line that contains the cursor to become double-width + <td colspan=6> This causes the line that tqcontains the cursor to become double-width single height. If the line was single width, all characters ro the right of the center of the screen will be lost. The cursor remains over the same character position, unless it would be to the right of @@ -2883,7 +2883,7 @@ Work is currently in progress to fix this issue. <td colspan=5 ><code> <b>ESC</b> <b>#</b> <b>5</b></code> <tr><td><p></td> <tr><td></td> - <td colspan=6> This causes the line which contains the cursor to become single-width, + <td colspan=6> This causes the line which tqcontains the cursor to become single-width, single-height. The cursor remains on the same character position. This is the default condition for all new lines on the screen. <tr><td><p></td></tr> @@ -2974,11 +2974,11 @@ Work is currently in progress to fix this issue. <td colspan=1 bgcolor="#5188B2"> N/A</td><td colspan=1 bgcolor="#5188B2">VT100</td><td colspan=1 bgcolor="#5188B2">emu</td><td colspan=1 bgcolor="#5188B2">Ignored</td><td colspan=1 bgcolor="#5188B2"></td><td colspan=1 bgcolor="#5188B2">see above</td></tr> <tr><td><p></td></tr> <tr><td bgcolor="#D0D0D0"><a name=DSRREP>DSRREP</a> - <td colspan=5 bgcolor="#D0D0D0"><b>Device Status Report Reply</b> + <td colspan=5 bgcolor="#D0D0D0"><b>Device tqStatus Report Reply</b> <td bgcolor="#D0D0D0">ECMA VT100 <tr><td><p></td> <tr><td> - <td colspan=5 ><code> <b>ESC</b> <b>[</b> <em>Status</em> <b>n</b></code> + <td colspan=5 ><code> <b>ESC</b> <b>[</b> <em>tqStatus</em> <b>n</b></code> <tr><td><p></td> <tr><td></td> <td colspan=6> Reports the general status of the VT100 according to the @@ -2989,7 +2989,7 @@ Work is currently in progress to fix this issue. <tr><td><p></td></tr> <tr> <td></td> -<td colspan=1 bgcolor="#D0D0D0"> Status</td><td colspan=3 bgcolor="#D0D0D0">Meaning</td></tr> +<td colspan=1 bgcolor="#D0D0D0"> tqStatus</td><td colspan=3 bgcolor="#D0D0D0">Meaning</td></tr> <tr> <td></td> <td colspan=1 bgcolor="#5188B2"> 0</td><td colspan=3 bgcolor="#5188B2">Ready, no faults detected</td></tr> @@ -2998,7 +2998,7 @@ Work is currently in progress to fix this issue. <td colspan=1 bgcolor="#5BA5B2"> 3</td><td colspan=3 bgcolor="#5BA5B2">Malfunction detected</td></tr> <tr><td><p></td></tr> <tr><td bgcolor="#D0D0D0"><a name=DSRREQ>DSRREQ</a> - <td colspan=5 bgcolor="#D0D0D0"><b>Device Status Report</b> + <td colspan=5 bgcolor="#D0D0D0"><b>Device tqStatus Report</b> <td bgcolor="#D0D0D0">ECMA VT100 <tr><td><p></td> <tr><td> @@ -3012,7 +3012,7 @@ Work is currently in progress to fix this issue. <td colspan=1 bgcolor="#D0D0D0"> Subcode</td><td colspan=1 bgcolor="#D0D0D0">Emulation</td><td colspan=1 bgcolor="#D0D0D0">Scope</td><td colspan=1 bgcolor="#D0D0D0">Operation</td><td colspan=1 bgcolor="#D0D0D0">Args</td><td colspan=1 bgcolor="#D0D0D0">Meaning</td></tr> <tr> <td></td> -<td colspan=1 bgcolor="#5188B2"> 5</td><td colspan=1 bgcolor="#5188B2">VT100</td><td colspan=1 bgcolor="#5188B2">emu</td><td colspan=1 bgcolor="#5188B2">reportStatus</td><td colspan=1 bgcolor="#5188B2"></td><td colspan=1 bgcolor="#5188B2">Report Status (using a <a href=#DSRREP>DSRREP</a> control sequence)</td></tr> +<td colspan=1 bgcolor="#5188B2"> 5</td><td colspan=1 bgcolor="#5188B2">VT100</td><td colspan=1 bgcolor="#5188B2">emu</td><td colspan=1 bgcolor="#5188B2">reporttqStatus</td><td colspan=1 bgcolor="#5188B2"></td><td colspan=1 bgcolor="#5188B2">Report tqStatus (using a <a href=#DSRREP>DSRREP</a> control sequence)</td></tr> <tr> <td></td> <td colspan=1 bgcolor="#5BA5B2"> 6</td><td colspan=1 bgcolor="#5BA5B2">VT100</td><td colspan=1 bgcolor="#5BA5B2">emu</td><td colspan=1 bgcolor="#5BA5B2">reportCursorPosition</td><td colspan=1 bgcolor="#5BA5B2"></td><td colspan=1 bgcolor="#5BA5B2">Report Active Position (using a <a href=#CPR>CPR</a> sequence)</td></tr> @@ -3740,7 +3740,7 @@ Work is currently in progress to fix this issue. The United Kingdom and ASCII sets conform to the "ISO international register of character sets to be used with escape sequences". The other sets are private character sets. Special graphics means that the - graphic characters fpr the codes 0137 to 0176 are replaced with other + graphic characters fpr the codes 0137 to 0176 are tqreplaced with other characters. The specified character set will be used until another SCS is received. <tr><td><p></td></tr> @@ -4513,12 +4513,12 @@ as noted. <tr><td>FETM </td><td>Format Effector Transfer </td><td>Reset</td></tr> <tr><td>GATM </td><td>Guarded Area Transfer </td><td>NA </td></tr> <tr><td>HEM </td><td>Horizontal Editing </td><td>NA </td></tr> -<tr><td>IRM </td><td>Insertion-replacement </td><td>Reset</td></tr> +<tr><td>IRM </td><td>Insertion-tqreplacement </td><td>Reset</td></tr> <tr><td>KAM </td><td>Keyboard Action </td><td>Reset</td></tr> <tr><td>MATM </td><td>Multiple area transfer </td><td>NA </td></tr> <tr><td>PUM </td><td>Positioning Unit </td><td>Reset</td></tr> <tr><td>SATM </td><td>Selected Area Transfer </td><td>NA </td></tr> -<tr><td>SRTM </td><td>Status Reporting Transfer</td><td>Reset</td></tr> +<tr><td>SRTM </td><td>tqStatus Reporting Transfer</td><td>Reset</td></tr> <tr><td>TSM </td><td>Tabulation Stop </td><td>Reset</td></tr> <tr><td>TTM </td><td>Transfer Termination </td><td>NA </td></tr> <tr><td>VEM </td><td>Vertical Editing </td><td>NA </td></tr> @@ -4542,7 +4542,7 @@ The notation <ESC> denotes a single ASCII Escape character, 1Bx. <h2>Special Graphics Characters</h2> If the Special Graphics set is selected, the graphics for ASCII codes -0137 through 0176 will be replaced according to the following table (see the +0137 through 0176 will be tqreplaced according to the following table (see the <a href=#SCS>SCS</a> control sequence). <center> <table cellspacing=30> diff --git a/konsole/eventsrc b/konsole/eventsrc index 12ceefc8b..cc2d02316 100644 --- a/konsole/eventsrc +++ b/konsole/eventsrc @@ -607,7 +607,7 @@ Name[cs]=Relace ukončena s nenulovým stavem Name[csb]=Seséja òstała zakùńczonô z nienulowim stónã Name[cy]=Gorffenodd y sesiwn efo cyflwr di-sero Name[da]=Session afsluttet med ikke-nul status -Name[de]=Sitzung beendet mit Status ungleich Null +Name[de]=Sitzung beendet mit tqStatus ungleich Null Name[el]=Η συνεδρία τελείωσε με μη μηδενική κατάσταση Name[eo]=Seanco finiĝis kun eraro Name[es]=Sesión terminada con estado no cero @@ -636,7 +636,7 @@ Name[mn]=Тэг бус төлвөөр суулт дууслаа Name[ms]=Sesi selesai dengan status bukan sifar Name[mt]=Sessjoni temmet bi status mhux zero Name[nb]=Økta ble avsluttet med en status ulik null -Name[nds]=Törn wöör mit Nich-Null-Status beendt +Name[nds]=Törn wöör mit Nich-Null-tqStatus beendt Name[ne]=शून्य नभएको स्थितिसँग सत्र अन्त्य भयो Name[nl]=Sessie is voltooid met een non-zero status Name[nn]=Økt avslutta med status ulik null @@ -675,7 +675,7 @@ Comment[cs]=Relace byla ukončena s nenulovým stavem Comment[csb]=Seséja zakùńczëła sã nienulowim stónã Comment[cy]=Terfynnodd sesiwn efo cyflwr di-sero Comment[da]=En session er afsluttet med ikke-nul status -Comment[de]=Sitzung beendet mit Status ungleich Null +Comment[de]=Sitzung beendet mit tqStatus ungleich Null Comment[el]=Μια συνεδρία τελείωσε με μη μηδενική κατάσταση Comment[eo]=Seanco finiĝis kun eraro Comment[es]=Ha terminado una sesión con estado no cero @@ -704,7 +704,7 @@ Comment[mn]=Name=Тэг бус төлвөөр суултаас гарлаа Comment[ms]=Satu sesi keluar dengan status bukan sifar Comment[mt]=Sessjoni temmet bi status mhux zero Comment[nb]=En økt ble avsluttet med en status som ikke var null -Comment[nds]=En Törn is mit Nich-Null-Status to't Enn kamen +Comment[nds]=En Törn is mit Nich-Null-tqStatus to't Enn kamen Comment[ne]=शून्य नभएको स्थितिसँग यो सत्र अन्त्य भयो Comment[nl]=Een sessie is beëindigd met een non-zero status Comment[nn]=Ei økt avslutta med status som ikkje var null diff --git a/konsole/konsole/TEHistory.cpp b/konsole/konsole/TEHistory.cpp index cbe8b199d..172887c9c 100644 --- a/konsole/konsole/TEHistory.cpp +++ b/konsole/konsole/TEHistory.cpp @@ -62,7 +62,7 @@ FIXME: There is noticeable decrease in speed, also. Perhaps, scheme with wrap around would be it's complexity. */ -//FIXME: tempory replacement for tmpfile +//FIXME: tempory tqreplacement for tmpfile // this is here one for debugging purpose. //#define tmpfile xTmpFile @@ -135,7 +135,7 @@ bool HistoryScroll::hasScroll() /* The history scroll makes a Row(Row(Cell)) from - two history buffers. The index buffer contains + two history buffers. The index buffer tqcontains start of line positions which refere to the cells buffer. @@ -457,7 +457,7 @@ void HistoryScrollBlockArray::addCells(ca a[], int count) size_t *pLen = new size_t; *pLen = count; - m_lineLengths.replace(m_blockArray.getCurrent(), pLen); + m_lineLengths.tqreplace(m_blockArray.getCurrent(), pLen); } void HistoryScrollBlockArray::addLine(bool) diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp index 86e916e57..76aeaaa7d 100644 --- a/konsole/konsole/TEPty.cpp +++ b/konsole/konsole/TEPty.cpp @@ -44,7 +44,7 @@ \par FIXME - [NOTE: much of the technical stuff below will be replaced by forkpty.] + [NOTE: much of the technical stuff below will be tqreplaced by forkpty.] publish the SIGCHLD signal if not related to an instance. diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp index 54b479844..1428ac90b 100644 --- a/konsole/konsole/TEScreen.cpp +++ b/konsole/konsole/TEScreen.cpp @@ -783,7 +783,7 @@ void TEScreen::compose(TQString compose) TQChar c(image[lastPos].c); compose.prepend(c); compose.compose(); - image[lastPos].c = compose[0].unicode(); + image[lastPos].c = compose[0].tqunicode(); } // Region commands ------------------------------------------------------------- @@ -1023,7 +1023,7 @@ void TEScreen::clearEntireScreen() } /*! fill screen with 'E' - This is to aid screen alignment + This is to aid screen tqalignment */ void TEScreen::helpAlign() @@ -1281,7 +1281,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) while (hX < eol && hX <= sel_Right % columns) { - Q_UINT16 c = hist->getCell(hY, hX++).c; + TQ_UINT16 c = hist->getCell(hY, hX++).c; if (c) m[d++] = c; s++; @@ -1293,7 +1293,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) } else { // or from screen image. if (testIsSelected((s - hist_BR) % columns, (s - hist_BR) / columns)) { - Q_UINT16 c = image[s++ - hist_BR].c; + TQ_UINT16 c = image[s++ - hist_BR].c; if (c) { m[d++] = c; newlineneeded = true; @@ -1334,7 +1334,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) while (hX < eol) { - Q_UINT16 c = hist->getCell(hY, hX++).c; + TQ_UINT16 c = hist->getCell(hY, hX++).c; if (c) m[d++] = c; s++; @@ -1401,7 +1401,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) while (s <= eol) { - Q_UINT16 c = image[s++ - hist_BR].c; + TQ_UINT16 c = image[s++ - hist_BR].c; if (c) m[d++] = c; } diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index cb16ff497..91087d9c0 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -116,7 +116,7 @@ bool TEWidget::s_standalone = false; static const ColorEntry base_color_table[TABLE_COLORS] = // The following are almost IBM standard color codes, with some slight // gamma correction for the dim colors to compensate for bright X screens. -// It contains the 8 ansiterm/xterm colors in 2 intensities. +// It tqcontains the 8 ansiterm/xterm colors in 2 intensities. { // Fixme: could add faint colors here, also. // normal @@ -144,7 +144,7 @@ static const ColorEntry base_color_table[TABLE_COLORS] = void TEWidget::setDefaultBackColor(const TQColor& color) { defaultBgColor = color; - if (qAlpha(blend_color) != 0xff && !backgroundPixmap()) + if (tqAlpha(blend_color) != 0xff && !backgroundPixmap()) setBackgroundColor(getDefaultBackColor()); } @@ -165,14 +165,14 @@ void TEWidget::setColorTable(const ColorEntry table[]) for (int i = 0; i < TABLE_COLORS; i++) color_table[i] = table[i]; const TQPixmap* pm = backgroundPixmap(); if (!pm) - if (!argb_visual || (qAlpha(blend_color) == 0xff)) + if (!argb_visual || (tqAlpha(blend_color) == 0xff)) setBackgroundColor(getDefaultBackColor()); else { - float alpha = qAlpha(blend_color) / 255.; - int pixel = qAlpha(blend_color) << 24 | - int(qRed(blend_color) * alpha) << 16 | - int(qGreen(blend_color) * alpha) << 8 | - int(qBlue(blend_color) * alpha); + float alpha = tqAlpha(blend_color) / 255.; + int pixel = tqAlpha(blend_color) << 24 | + int(tqRed(blend_color) * alpha) << 16 | + int(tqGreen(blend_color) * alpha) << 8 | + int(tqBlue(blend_color) * alpha); setBackgroundColor(TQColor(blend_color, pixel)); } update(); @@ -191,14 +191,14 @@ void TEWidget::setColorTable(const ColorEntry table[]) xterm fonts have these at 0x00..0x1f. QT's iso mapping leaves 0x00..0x7f without any changes. But the graphicals - come in here as proper unicode characters. + come in here as proper tqunicode characters. We treat non-iso10646 fonts as VT100 extended and do the requiered mapping - from unicode to 0x00..0x1f. The remaining translation is then left to the + from tqunicode to 0x00..0x1f. The remaining translation is then left to the QCodec. */ -static inline bool isLineChar(Q_UINT16 c) { return ((c & 0xFF80) == 0x2500);} +static inline bool isLineChar(TQ_UINT16 c) { return ((c & 0xFF80) == 0x2500);} // assert for i in [0..31] : vt100extended(vt100_graphics[i]) == i. @@ -213,7 +213,7 @@ unsigned short vt100_graphics[32] = /* static TQChar vt100extended(TQChar c) { - switch (c.unicode()) + switch (c.tqunicode()) { case 0x25c6 : return 1; case 0x2592 : return 2; @@ -265,7 +265,7 @@ void TEWidget::fontChange(const TQFont &) // "Base character width on widest ASCII character. This prevents too wide // characters in the presence of double wide (e.g. Japanese) characters." // Get the width from representative normal width characters - font_w = qRound((double)fm.width(REPCHAR)/(double)strlen(REPCHAR)); + font_w = tqRound((double)fm.width(REPCHAR)/(double)strlen(REPCHAR)); fixed_font = true; int fw = fm.width(REPCHAR[0]); @@ -382,7 +382,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) ,m_cursorCol(0) ,m_isIMEdit(false) ,m_isIMSel(false) -,blend_color(qRgba(0,0,0,0xff)) +,blend_color(tqRgba(0,0,0,0xff)) { // The offsets are not yet calculated. // Do not calculate these too often to be more smoothly when resizing @@ -405,7 +405,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) setMouseMarks(true); setColorTable(base_color_table); // init color table - qApp->installEventFilter( this ); //FIXME: see below + tqApp->installEventFilter( this ); //FIXME: see below KCursor::setAutoHideCursor( this, true ); // Init DnD //////////////////////////////////////////////////////////////// @@ -428,7 +428,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) // Here's a start (David) TEWidget::~TEWidget() { - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); if (image) free(image); } @@ -439,7 +439,7 @@ TEWidget::~TEWidget() /* ------------------------------------------------------------------------- */ /** - A table for emulating the simple (single width) unicode drawing chars. + A table for emulating the simple (single width) tqunicode drawing chars. It represents the 250x - 257x glyphs. If it's zero, we can't use it. if it's not, it's encoded as follows: imagine a 5x5 grid where the points are numbered 0 to 24 left to top, top to bottom. Each point is represented by the corresponding bit. @@ -496,7 +496,7 @@ static void drawLineChar(TQPainter& paint, int x, int y, int w, int h, uchar cod int ex = x + w - 1; int ey = y + h - 1; - Q_UINT32 toDraw = LineChars[code]; + TQ_UINT32 toDraw = LineChars[code]; //Top lines: if (toDraw & TopL) @@ -576,7 +576,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y, } //Check for line-drawing char - if (isLineChar(drawstr[0].unicode())) + if (isLineChar(drawstr[0].tqunicode())) { uchar code = drawstr[0].cell(); if (LineChars[code]) @@ -624,17 +624,17 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, attr->b == cacol(CO_DFT, colorsSwapped ? DEFAULT_FORE_COLOR : DEFAULT_BACK_COLOR) ) // draw background colors with 75% opacity - if ( argb_visual && qAlpha(blend_color) < 0xff ) { + if ( argb_visual && tqAlpha(blend_color) < 0xff ) { QRgb col = bColor.rgb(); - Q_UINT8 salpha = 192; - Q_UINT8 dalpha = 255 - salpha; + TQ_UINT8 salpha = 192; + TQ_UINT8 dalpha = 255 - salpha; int a, r, g, b; - a = QMIN( (qAlpha (col) * salpha) / 255 + (qAlpha (blend_color) * dalpha) / 255, 255 ); - r = QMIN( (qRed (col) * salpha) / 255 + (qRed (blend_color) * dalpha) / 255, 255 ); - g = QMIN( (qGreen (col) * salpha) / 255 + (qGreen (blend_color) * dalpha) / 255, 255 ); - b = QMIN( (qBlue (col) * salpha) / 255 + (qBlue (blend_color) * dalpha) / 255, 255 ); + a = QMIN( (tqAlpha (col) * salpha) / 255 + (tqAlpha (blend_color) * dalpha) / 255, 255 ); + r = QMIN( (tqRed (col) * salpha) / 255 + (tqRed (blend_color) * dalpha) / 255, 255 ); + g = QMIN( (tqGreen (col) * salpha) / 255 + (tqGreen (blend_color) * dalpha) / 255, 255 ); + b = QMIN( (tqBlue (col) * salpha) / 255 + (tqBlue (blend_color) * dalpha) / 255, 255 ); col = a << 24 | r << 16 | g << 8 | b; int pixel = a << 24 | (r * a / 255) << 16 | (g * a / 255) << 8 | (b * a / 255); @@ -695,8 +695,8 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, { // ### Disabled for now, since it causes problems with characters // that use the full width and/or height of the character cells. - //bool shadow = ( !isPrinting && qAlpha(blend_color) < 0xff - // && qGray( fColor.rgb() ) > 64 ); + //bool shadow = ( !isPrinting && tqAlpha(blend_color) < 0xff + // && tqGray( fColor.rgb() ) > 64 ); bool shadow = false; paint.setPen(fColor); int x = rect.x(); @@ -830,7 +830,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) const ca* lcl = &image[y*this->columns]; const ca* const ext = &newimg[y*columns]; - // The dirty mask indicates which characters need repainting. We also + // The dirty tqmask indicates which characters need tqrepainting. We also // mark surrounding neighbours dirty, in case the character exceeds // its cell boundaries memset(dirtyMask, 0, cols+2); @@ -856,7 +856,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) // where characters exceed their cell width. if (dirtyMask[x]) { - Q_UINT16 c = ext[x+0].c; + TQ_UINT16 c = ext[x+0].c; if ( !c ) continue; int p = 0; @@ -947,7 +947,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) mResizeLabel = new TQLabel(i18n("Size: XXX x XXX"), mResizeWidget); l->addWidget(mResizeLabel, 1, AlignCenter); mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20); - mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20); + mResizeWidget->setMinimumHeight(mResizeLabel->tqsizeHint().height()+20); mResizeTimer = new TQTimer(this); connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide())); } @@ -1097,7 +1097,7 @@ void TEWidget::paintContents(TQPainter &paint, const TQRect &rect, bool pm) TQChar *disstrU = new QChar[columns]; for (int y = luy; y <= rly; y++) { - Q_UINT16 c = image[loc(lux,y)].c; + TQ_UINT16 c = image[loc(lux,y)].c; int x = lux; if(!c && x) x--; // Search for start of multi-col char @@ -1152,14 +1152,14 @@ void TEWidget::blinkEvent() { blinking = !blinking; isBlinkEvent = true; - repaint(false); + tqrepaint(false); isBlinkEvent = false; } void TEWidget::blinkCursorEvent() { cursorBlinking = !cursorBlinking; - repaint(cursorRect, true); + tqrepaint(cursorRect, true); } /* ------------------------------------------------------------------------- */ @@ -1178,9 +1178,9 @@ void TEWidget::propagateSize() if (isFixedSize) { setSize(columns, lines); - TQFrame::setFixedSize(sizeHint()); - parentWidget()->adjustSize(); - parentWidget()->setFixedSize(parentWidget()->sizeHint()); + TQFrame::setFixedSize(tqsizeHint()); + tqparentWidget()->adjustSize(); + tqparentWidget()->setFixedSize(tqparentWidget()->tqsizeHint()); return; } if (image) @@ -1288,7 +1288,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) return; } - if ( !contentsRect().contains(ev->pos()) ) return; + if ( !contentsRect().tqcontains(ev->pos()) ) return; TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); @@ -1371,7 +1371,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev) return; } else if (dragInfo.state == diDragging) { // this isn't technically needed because mouseMoveEvent is suppressed during - // Qt drag operations, replaced by dragMoveEvent + // Qt drag operations, tqreplaced by dragMoveEvent return; } @@ -1390,7 +1390,7 @@ void TEWidget::setSelectionEnd() void TEWidget::extendSelection( TQPoint pos ) { - //if ( !contentsRect().contains(ev->pos()) ) return; + //if ( !contentsRect().tqcontains(ev->pos()) ) return; TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); @@ -1735,14 +1735,14 @@ void TEWidget::mouseTripleClickEvent(TQMouseEvent* ev) void TEWidget::focusInEvent( TQFocusEvent * ) { - repaint(cursorRect, true); // *do* erase area, to get rid of the + tqrepaint(cursorRect, true); // *do* erase area, to get rid of the // hollow cursor rectangle. } void TEWidget::focusOutEvent( TQFocusEvent * ) { - repaint(cursorRect, true); // don't erase area + tqrepaint(cursorRect, true); // don't erase area } bool TEWidget::focusNextPrevChild( bool next ) @@ -1759,7 +1759,7 @@ int TEWidget::charClass(UINT16 ch) const TQChar qch=TQChar(ch); if ( qch.isSpace() ) return ' '; - if ( qch.isLetterOrNumber() || word_characters.contains(qch, false) ) + if ( qch.isLetterOrNumber() || word_characters.tqcontains(qch, false) ) return 'a'; // Everything else is weird @@ -1802,7 +1802,7 @@ void TEWidget::emitSelection(bool useXselection,bool appendReturn) text.append("\r"); if ( ! text.isEmpty() ) { - text.replace("\n", "\r"); + text.tqreplace("\n", "\r"); TQKeyEvent e(TQEvent::KeyPress, 0,-1,0, text); emit keyPressedSignal(&e); // expose as a big fat keypress event emit clearSelectionSignal(); @@ -1853,7 +1853,7 @@ void TEWidget::onClearSelection() //FIXME: an `eventFilter' has been installed instead of a `keyPressEvent' // due to a bug in `QT' or the ignorance of the author to prevent -// repaint events being emitted to the screen whenever one leaves +// tqrepaint events being emitted to the screen whenever one leaves // or reenters the screen to/from another application. // // Troll says one needs to change focusInEvent() and focusOutEvent(), @@ -1873,7 +1873,7 @@ void TEWidget::doScroll(int lines) bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) { if ( (e->type() == TQEvent::Accel || - e->type() == TQEvent::AccelAvailable ) && qApp->focusWidget() == this ) + e->type() == TQEvent::AccelAvailable ) && tqApp->tqfocusWidget() == this ) { static_cast<TQKeyEvent *>( e )->ignore(); return false; @@ -1971,13 +1971,13 @@ void TEWidget::imEndEvent( TQIMEvent *e ) int tLx = tL.x(); int tLy = tL.y(); - TQRect repaintRect = TQRect( bX+tLx, bY+tLy+font_h*m_imStartLine, + TQRect tqrepaintRect = TQRect( bX+tLx, bY+tLy+font_h*m_imStartLine, contentsRect().width(), contentsRect().height() ); m_imStart = 0; m_imPreeditLength = 0; m_isIMEdit = m_isIMSel = false; - repaint( repaintRect, true ); + tqrepaint( tqrepaintRect, true ); } // Override any Ctrl+<key> accelerator when pressed with the keyboard @@ -2097,7 +2097,7 @@ void TEWidget::clearImage() void TEWidget::calcGeometry() { - scrollbar->resize(TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent), + scrollbar->resize(TQApplication::style().tqpixelMetric(TQStyle::PM_ScrollBarExtent), contentsRect().height()); switch(scrollLoc) { @@ -2170,7 +2170,7 @@ void TEWidget::setFixedSize(int cols, int lins) TQFrame::setFixedSize(m_size); } -TQSize TEWidget::sizeHint() const +TQSize TEWidget::tqsizeHint() const { return m_size; } @@ -2235,7 +2235,7 @@ void TEWidget::dropEvent(TQDropEvent* event) TQString tmp; if (url.isLocalFile()) { tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others - } else if ( url.protocol() == TQString::fromLatin1( "mailto" ) ) { + } else if ( url.protocol() == TQString::tqfromLatin1( "mailto" ) ) { justPaste = true; break; } else { diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h index 2c11eac2e..ae7e0a8ec 100644 --- a/konsole/konsole/TEWidget.h +++ b/konsole/konsole/TEWidget.h @@ -96,7 +96,7 @@ public: void updateImageSize(); void setSize(int cols, int lins); void setFixedSize(int cols, int lins); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void setWordCharacters(TQString wc); TQString wordCharacters() { return word_characters; } diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index 0bdb0f42c..a60246106 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -307,7 +307,7 @@ void TEmuVt102::initTokenizer() #define ESC 27 #define CNTL(c) ((c)-'@') -// process an incoming unicode character +// process an incoming tqunicode character void TEmuVt102::onRcvChar(int cc) { int i; @@ -606,7 +606,7 @@ switch( N ) case TY_CSI_PS('m', 106) : scr->setBackColor (CO_SYS, 14); break; case TY_CSI_PS('m', 107) : scr->setBackColor (CO_SYS, 15); break; - case TY_CSI_PS('n', 5) : reportStatus ( ); break; + case TY_CSI_PS('n', 5) : reporttqStatus ( ); break; case TY_CSI_PS('n', 6) : reportCursorPosition ( ); break; case TY_CSI_PS('q', 0) : /* IGNORED: LEDs off */ break; //VT100 case TY_CSI_PS('q', 1) : /* IGNORED: LED1 on */ break; //VT100 @@ -847,7 +847,7 @@ void TEmuVt102::reportTerminalParms(int p) /*! */ -void TEmuVt102::reportStatus() +void TEmuVt102::reporttqStatus() { sendString("\033[0n"); //VT100. Device status report. 0 = Ready. } @@ -1007,7 +1007,7 @@ void TEmuVt102::onKeyPress( TQKeyEvent* ev ) // Character Set Conversion ------------------------------------------------ -- /* - The processing contains a VT100 specific code translation layer. + The processing tqcontains a VT100 specific code translation layer. It's still in use and mainly responsible for the line drawing graphics. These and some other glyphs are assigned to codes (0x5f-0xfe) @@ -1328,7 +1328,7 @@ static int xkb_init() #if 0 // This method doesn't work in all cases. The atom "ScrollLock" doesn't seem // to exist on all XFree versions (at least it's not here with my 3.3.6) - DF -static unsigned int xkb_mask_modifier( XkbDescPtr xkb, const char *name ) +static unsigned int xkb_tqmask_modifier( XkbDescPtr xkb, const char *name ) { int i; if( !xkb || !xkb->names ) @@ -1344,30 +1344,30 @@ static unsigned int xkb_mask_modifier( XkbDescPtr xkb, const char *name ) { if (atom == xkb->names->vmods[i] ) { - unsigned int mask; - XkbVirtualModsToReal( xkb, 1 << i, &mask ); - return mask; + unsigned int tqmask; + XkbVirtualModsToReal( xkb, 1 << i, &tqmask ); + return tqmask; } } return 0; } -static unsigned int xkb_scrolllock_mask() +static unsigned int xkb_scrolllock_tqmask() { XkbDescPtr xkb; if(( xkb = XkbGetKeyboard( qt_xdisplay(), XkbAllComponentsMask, XkbUseCoreKbd )) != NULL ) { - unsigned int mask = xkb_mask_modifier( xkb, "ScrollLock" ); + unsigned int tqmask = xkb_tqmask_modifier( xkb, "ScrollLock" ); XkbFreeKeyboard( xkb, 0, True ); - return mask; + return tqmask; } return 0; } #else -static unsigned int xkb_scrolllock_mask() +static unsigned int xkb_scrolllock_tqmask() { - int scrolllock_mask = 0; + int scrolllock_tqmask = 0; XModifierKeymap* map = XGetModifierMapping( qt_xdisplay() ); KeyCode scrolllock_keycode = XKeysymToKeycode( qt_xdisplay(), XK_Scroll_Lock ); if( scrolllock_keycode == NoSymbol ) { @@ -1379,42 +1379,42 @@ static unsigned int xkb_scrolllock_mask() ++i ) { if( map->modifiermap[ map->max_keypermod * i ] == scrolllock_keycode ) - scrolllock_mask += 1 << i; + scrolllock_tqmask += 1 << i; } XFreeModifiermap(map); - return scrolllock_mask; + return scrolllock_tqmask; } #endif -static unsigned int scrolllock_mask = 0; +static unsigned int scrolllock_tqmask = 0; static int xkb_set_on() { - if (!scrolllock_mask) + if (!scrolllock_tqmask) { if( !xkb_init()) return 0; - scrolllock_mask = xkb_scrolllock_mask(); - if( scrolllock_mask == 0 ) + scrolllock_tqmask = xkb_scrolllock_tqmask(); + if( scrolllock_tqmask == 0 ) return 0; } - XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, scrolllock_mask, scrolllock_mask); + XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, scrolllock_tqmask, scrolllock_tqmask); return 1; } static int xkb_set_off() { - if (!scrolllock_mask) + if (!scrolllock_tqmask) { if( !xkb_init()) return 0; - scrolllock_mask = xkb_scrolllock_mask(); - if( scrolllock_mask == 0 ) + scrolllock_tqmask = xkb_scrolllock_tqmask(); + if( scrolllock_tqmask == 0 ) return 0; } - XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, scrolllock_mask, 0); + XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, scrolllock_tqmask, 0); return 1; } diff --git a/konsole/konsole/TEmuVt102.h b/konsole/konsole/TEmuVt102.h index 05f30ac04..fde0f9557 100644 --- a/konsole/konsole/TEmuVt102.h +++ b/konsole/konsole/TEmuVt102.h @@ -117,7 +117,7 @@ private: void reportTerminalType(); void reportSecondaryAttributes(); - void reportStatus(); + void reporttqStatus(); void reportAnswerBack(); void reportCursorPosition(); void reportTerminalParms(int p); diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index 39aeab542..f8e3e501d 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -251,7 +251,7 @@ int TEmulation::keymapNo() */ void TEmulation::onRcvChar(int c) -// process application unicode input to terminal +// process application tqunicode input to terminal // this is a trivial scanner { c &= 0xff; @@ -284,7 +284,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev ) scr->setHistCursor(scr->getHistLines()); if (!ev->text().isEmpty()) { // A block of text - // Note that the text is proper unicode. + // Note that the text is proper tqunicode. // We should do a conversion here, but since this // routine will never be used, we simply emit plain ascii. emit sndBlock(ev->text().ascii(),ev->text().length()); @@ -299,7 +299,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev ) // Unblocking, Byte to Unicode translation --------------------------------- -- /* - We are doing code conversion from locale to unicode first. + We are doing code conversion from locale to tqunicode first. */ void TEmulation::onRcvBlock(const char *s, int len) @@ -345,7 +345,7 @@ void TEmulation::onRcvBlock(const char *s, int len) if (r[j].category() == TQChar::Mark_NonSpacing) scr->compose(r.mid(j,1)); else - onRcvChar(r[j].unicode()); + onRcvChar(r[j].tqunicode()); } i = l; } diff --git a/konsole/konsole/fontembedder.cpp b/konsole/konsole/fontembedder.cpp index dfbd88ce4..d0c17e084 100644 --- a/konsole/konsole/fontembedder.cpp +++ b/konsole/konsole/fontembedder.cpp @@ -26,7 +26,7 @@ using namespace std; -static Q_UINT32 charVal(TQChar val) +static TQ_UINT32 charVal(TQChar val) { if (val == ' ') return 0; @@ -34,13 +34,13 @@ static Q_UINT32 charVal(TQChar val) return 1; } -static Q_UINT32 readGlyphLine(TQTextStream& input) +static TQ_UINT32 readGlyphLine(TQTextStream& input) { TQString line = input.readLine(); while (line.length() < 5) line += ' '; - Q_UINT32 val = charVal(line[0]) | + TQ_UINT32 val = charVal(line[0]) | (charVal(line[1]) << 1) | (charVal(line[2]) << 2) | (charVal(line[3]) << 3) | @@ -48,7 +48,7 @@ static Q_UINT32 readGlyphLine(TQTextStream& input) return val; } -static Q_UINT32 readGlyph(TQTextStream& input) +static TQ_UINT32 readGlyph(TQTextStream& input) { return readGlyphLine(input) | (readGlyphLine(input) << 5) | @@ -72,7 +72,7 @@ int main(int argc, char **argv) TQTextStream input(&inFile); - Q_UINT32 glyphStates[128]; + TQ_UINT32 glyphStates[128]; for (int i = 0; i < 128; ++i) glyphStates[i] = 0; //nothing.. @@ -98,7 +98,7 @@ int main(int argc, char **argv) //Output. cout<<"// WARNING: Autogenerated by \"fontembedder " << argv[1] << "\".\n"; cout<<"// You probably do not want to hand-edit this!\n\n"; - cout<<"static const Q_UINT32 LineChars[] = {\n"; + cout<<"static const TQ_UINT32 LineChars[] = {\n"; //Nicely formatted: 8 per line, 16 lines for (int line = 0; line < 128; line += 8) diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index 36e299bc0..af97b0a85 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -41,8 +41,8 @@ instances represent the individual assignments */ -KeyTrans::KeyEntry::KeyEntry(int _ref, int _key, int _bits, int _mask, int _cmd, TQString _txt) -: ref(_ref), key(_key), bits(_bits), mask(_mask), cmd(_cmd), txt(_txt) +KeyTrans::KeyEntry::KeyEntry(int _ref, int _key, int _bits, int _tqmask, int _cmd, TQString _txt) +: ref(_ref), key(_key), bits(_bits), tqmask(_tqmask), cmd(_cmd), txt(_txt) { } @@ -50,20 +50,20 @@ KeyTrans::KeyEntry::~KeyEntry() { } -bool KeyTrans::KeyEntry::matches(int _key, int _bits, int _mask) -{ int m = mask & _mask; +bool KeyTrans::KeyEntry::matches(int _key, int _bits, int _tqmask) +{ int m = tqmask & _tqmask; return _key == key && (bits & m) == (_bits & m); } bool KeyTrans::KeyEntry::metaspecified(void) { - return ((mask & (1 << BITS_Alt)) && (bits & (1 << BITS_Alt))) || - ((mask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod))); + return ((tqmask & (1 << BITS_Alt)) && (bits & (1 << BITS_Alt))) || + ((tqmask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod))); } bool KeyTrans::KeyEntry::anymodspecified(void) { - return (mask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod)); + return (tqmask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod)); } TQString KeyTrans::KeyEntry::text() @@ -110,17 +110,17 @@ KeyTrans::~KeyTrans() { } -KeyTrans::KeyEntry* KeyTrans::addEntry(int ref, int key, int bits, int mask, int cmd, TQString txt) +KeyTrans::KeyEntry* KeyTrans::addEntry(int ref, int key, int bits, int tqmask, int cmd, TQString txt) // returns conflicting entry { for (TQPtrListIterator<KeyEntry> it(tableX); it.current(); ++it) { - if (it.current()->matches(key,bits,mask)) + if (it.current()->matches(key,bits,tqmask)) { return it.current(); } } - tableX.append(new KeyEntry(ref,key,bits,mask,cmd,txt)); + tableX.append(new KeyEntry(ref,key,bits,tqmask,cmd,txt)); return (KeyEntry*)NULL; } @@ -141,10 +141,10 @@ bool KeyTrans::findEntry(int key, int bits, int* cmd, const char** txt, int* len { static char buf[16]; char *c; - char mask = '1' + BITS(0, bits&(1<<BITS_Shift)) + BITS(1, bits&(1<<BITS_Alt)) + BITS(2, bits&(1<<BITS_Control)); + char tqmask = '1' + BITS(0, bits&(1<<BITS_Shift)) + BITS(1, bits&(1<<BITS_Alt)) + BITS(2, bits&(1<<BITS_Control)); strcpy(buf, it.current()->txt.ascii()); c = (char*)strchr(buf, '*'); - if (c) *c = mask; + if (c) *c = tqmask; *txt = buf; } else @@ -402,7 +402,7 @@ Loop: //printf(" key %s (%04x)",res.latin1(),(int)syms->keysyms[res]-1); getSymbol(); // + - : int mode = 0; - int mask = 0; + int tqmask = 0; while (sym == SYMOpr && (!strcmp(res.latin1(),"+") || !strcmp(res.latin1(),"-"))) { bool on = !strcmp(res.latin1(),"+"); @@ -411,14 +411,14 @@ Loop: assertSyntax(sym == SYMName, "Name expected") assertSyntax(syms->modsyms[res], "Unknown mode name") ptrdiff_t bits = (ptrdiff_t)(syms->modsyms[res]) - 1; - if (mask & (1 << bits)) + if (tqmask & (1 << bits)) { fprintf(stderr,"%s(%d,%d): mode name used multiple times.\n",path.ascii(),slinno,scolno); } else { mode |= (on << bits); - mask |= (1 << bits); + tqmask |= (1 << bits); } //printf(", mode %s(%d) %s",res.latin1(),(int)syms->modsyms[res]-1,on?"on":"off"); getSymbol(); @@ -441,8 +441,8 @@ Loop: //for (unsigned i = 0; i < res.length(); i++) //printf(" %02x(%c)",res.latin1()[i],res.latin1()[i]>=' '?res.latin1()[i]:'?'); } -//printf(". summary %04x,%02x,%02x,%d\n",key,mode,mask,cmd); - KeyTrans::KeyEntry* ke = kt->addEntry(slinno,key,mode,mask,cmd,res); +//printf(". summary %04x,%02x,%02x,%d\n",key,mode,tqmask,cmd); + KeyTrans::KeyEntry* ke = kt->addEntry(slinno,key,mode,tqmask,cmd,res); if (ke) { fprintf(stderr,"%s(%d): keystroke already assigned in line %d.\n",path.ascii(),slinno,ke->ref); diff --git a/konsole/konsole/keytrans.h b/konsole/konsole/keytrans.h index 2ddf5f776..c5268c4fd 100644 --- a/konsole/konsole/keytrans.h +++ b/konsole/konsole/keytrans.h @@ -68,9 +68,9 @@ class KeyTrans class KeyEntry { public: - KeyEntry(int ref, int key, int bits, int mask, int cmd, TQString txt); + KeyEntry(int ref, int key, int bits, int tqmask, int cmd, TQString txt); ~KeyEntry(); - bool matches(int key, int bits, int mask); + bool matches(int key, int bits, int tqmask); bool metaspecified(void); bool anymodspecified(void); TQString text(); @@ -78,14 +78,14 @@ class KeyTrans private: int key; int bits; - int mask; + int tqmask; public: int cmd; TQString txt; }; private: - KeyEntry* addEntry(int ref, int key, int bits, int mask, int cmd, TQString txt); + KeyEntry* addEntry(int ref, int key, int bits, int tqmask, int cmd, TQString txt); void addKeyTrans(); void readConfig(); TQPtrList<KeyEntry> tableX; diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index ecef79d4a..5badd652d 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -789,7 +789,7 @@ void Konsole::makeGUI() KeyTrans* ktr = kt_map[*it]; assert( ktr ); TQString title=ktr->hdr(); - m_keytab->insertItem(title.replace('&',"&&"),ktr->numb()); + m_keytab->insertItem(title.tqreplace('&',"&&"),ktr->numb()); } applySettingsToGUI(); @@ -1280,7 +1280,7 @@ void Konsole::setColLin(int columns, int lines) te->setSize(columns, lines); adjustSize(); if (b_fixedSize) - setFixedSize(sizeHint()); + setFixedSize(tqsizeHint()); notifySize(columns, lines); // set menu items } } @@ -1316,7 +1316,7 @@ void Konsole::slotTabContextMenu(TQWidget* _te, const TQPoint & pos) int counter=0; for (TESession *ses = sessions.first(); ses; ses = sessions.next()) { TQString title=ses->Title(); - m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++); + m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.tqreplace('&',"&&"),counter++); } m_tabPopupMenu->popup( pos ); @@ -1382,7 +1382,7 @@ void Konsole::slotTabSetViewOptions(int mode) else title = sessions.at(i)->Title(); - title=title.replace('&',"&&"); + title=title.tqreplace('&',"&&"); switch(mode) { case ShowIconAndText: tabwidget->changeTab(page, icon, title); @@ -1428,7 +1428,7 @@ void Konsole::slotSaveSessionsProfile() TQString::null, &ok, this ); if ( ok ) { TQString path = locateLocal( "data", - TQString::fromLatin1( "konsole/profiles/" ) + prof, + TQString::tqfromLatin1( "konsole/profiles/" ) + prof, KGlobal::instance() ); if ( TQFile::exists( path ) ) @@ -1635,7 +1635,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa delete rootxpms[te]; rootxpms.remove(te); } - pixmap_menu_activated(sch->alignment()); + pixmap_menu_activated(sch->tqalignment()); } te->setColorTable(sch->table()); //FIXME: set twice here to work around a bug @@ -1874,7 +1874,7 @@ void Konsole::updateSchemaMenu() ColorSchema* s = (ColorSchema*)colors->at(i); assert( s ); TQString title=s->title(); - m_schema->insertItem(title.replace('&',"&&"),s->numb(),0); + m_schema->insertItem(title.tqreplace('&',"&&"),s->numb(),0); } if (te && se) @@ -1912,7 +1912,7 @@ void Konsole::slotToggleMenubar() { if (b_fixedSize) { adjustSize(); - setFixedSize(sizeHint()); + setFixedSize(tqsizeHint()); } if (!showMenubar->isChecked()) { setCaption(i18n("Use the right mouse button to bring back the menu")); @@ -1987,12 +1987,12 @@ void Konsole::slotSelectTabbar() { /* FIXME: Still necessary ? */ TQPtrDictIterator<KRootPixmap> it(rootxpms); for (;it.current();++it) - it.current()->repaint(true); + it.current()->tqrepaint(true); if (b_fixedSize) { adjustSize(); - setFixedSize(sizeHint()); + setFixedSize(tqsizeHint()); } } @@ -2224,7 +2224,7 @@ void Konsole::updateTitle(TESession* _se) if (m_tabViewMode == ShowIconOnly) tabwidget->changeTab( _se->widget(), TQString::null ); else if (b_matchTabWinTitle) - tabwidget->setTabLabel( _se->widget(), _se->fullTitle().replace('&',"&&")); + tabwidget->setTabLabel( _se->widget(), _se->fullTitle().tqreplace('&',"&&")); } void Konsole::initSessionFont(TQFont font) { @@ -2362,7 +2362,7 @@ void Konsole::enterURL(const TQString& URL, const TQString&) KRun::shellQuote(newtext); te->emitText("cd "+newtext+"\r"); } - else if (URL.contains("://", true)) { + else if (URL.tqcontains("://", true)) { KURL u(URL); newtext = u.protocol(); bool isSSH = (newtext == "ssh"); @@ -2445,7 +2445,7 @@ void Konsole::addSession(TESession* s) s->setTitle(newTitle); // create an action for the session - KRadioAction *ra = new KRadioAction(newTitle.replace('&',"&&"), + KRadioAction *ra = new KRadioAction(newTitle.tqreplace('&',"&&"), s->IconName(), 0, this, @@ -2496,7 +2496,7 @@ void Konsole::listSessions() m_sessionList->setKeyboardShortcutsEnabled(true); for (TESession *ses = sessions.first(); ses; ses = sessions.next()) { TQString title=ses->Title(); - m_sessionList->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++); + m_sessionList->insertItem(SmallIcon(ses->IconName()),title.tqreplace('&',"&&"),counter++); } m_sessionList->adjustSize(); m_sessionList->popup(mapToGlobal(TQPoint((width()/2)-(m_sessionList->width()/2),(height()/2)-(m_sessionList->height()/2)))); @@ -2575,7 +2575,7 @@ void Konsole::activateSession(TESession *s) s_schema = cs->relPath(); curr_schema = cs->numb(); pmPath = cs->imagePath(); - n_render = cs->alignment(); + n_render = cs->tqalignment(); // BR 106464 temporary fix... // only 2 sessions opened, 2nd session viewable, right-click on 1st tab and @@ -3138,7 +3138,7 @@ void Konsole::moveSessionLeft() tabwidget->blockSignals(false); TQString title = se->Title(); createSessionTab(se->widget(), iconSetForSession(se), - title.replace('&', "&&"), position-1); + title.tqreplace('&', "&&"), position-1); tabwidget->showPage(se->widget()); tabwidget->setTabColor(se->widget(),oldcolor); @@ -3171,7 +3171,7 @@ void Konsole::moveSessionRight() tabwidget->blockSignals(false); TQString title = se->Title(); createSessionTab(se->widget(), iconSetForSession(se), - title.replace('&', "&&"), position+1); + title.tqreplace('&', "&&"), position+1); tabwidget->showPage(se->widget()); tabwidget->setTabColor(se->widget(),oldcolor); @@ -3383,7 +3383,7 @@ void Konsole::addSessionCommand(const TQString &path) TQString name = comment; name.prepend("SSC_"); // Allows easy searching for Session ShortCuts - name.replace(" ", "_"); + name.tqreplace(" ", "_"); sl_sessionShortCuts << name; // Is there already this shortcut? @@ -3433,13 +3433,13 @@ void Konsole::createSessionMenus() TQString txt = cfg->readEntry("Name"); TQString icon = cfg->readEntry("Icon", "konsole"); insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon), - txt.replace('&',"&&"), SESSION_NEW_SHELL_ID ); + txt.tqreplace('&',"&&"), SESSION_NEW_SHELL_ID ); TQString comment = cfg->readEntry("Comment"); if (comment.isEmpty()) comment=txt.prepend(i18n("New ")); insertItemSorted(m_session, SmallIconSet(icon), - comment.replace('&',"&&"), SESSION_NEW_SHELL_ID); + comment.tqreplace('&',"&&"), SESSION_NEW_SHELL_ID); m_session->insertItem(SmallIconSet("window_new"), i18n("New &Window"), SESSION_NEW_WINDOW_ID); m_tabbarSessionsCommands->insertItem(SmallIconSet("window_new"), @@ -3455,12 +3455,12 @@ void Konsole::createSessionMenus() TQString txt = (*it).readEntry("Name"); TQString icon = (*it).readEntry("Icon", "konsole"); insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon), - txt.replace('&',"&&"), it.currentKey() ); + txt.tqreplace('&',"&&"), it.currentKey() ); TQString comment = (*it).readEntry("Comment"); if (comment.isEmpty()) comment=txt.prepend(i18n("New ")); insertItemSorted(m_session, SmallIconSet(icon), - comment.replace('&',"&&"), it.currentKey()); + comment.tqreplace('&',"&&"), it.currentKey()); } if (m_bookmarksSession) @@ -3483,7 +3483,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket) co->writeEntry("Name", socket); TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket); co->writeEntry("Comment", txt); - co->writePathEntry("Exec", TQString::fromLatin1("SCREENDIR=%1 screen -r %2") + co->writePathEntry("Exec", TQString::tqfromLatin1("SCREENDIR=%1 screen -r %2") .arg(path).arg(socket)); TQString icon = "konsole"; cmd_serial++; @@ -3616,7 +3616,7 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget) rootxpms.insert( tewidget, new KRootPixmap(tewidget) ); rootxpms[tewidget]->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b())); } else { - tewidget->setBlendColor(qRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255))); + tewidget->setBlendColor(tqRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255))); tewidget->setErasePixmap( TQPixmap() ); // make sure any background pixmap is unset } } else { @@ -3624,8 +3624,8 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget) delete rootxpms[tewidget]; rootxpms.remove(tewidget); } - pixmap_menu_activated(s->alignment(), tewidget); - tewidget->setBlendColor(qRgba(0, 0, 0, 0xff)); + pixmap_menu_activated(s->tqalignment(), tewidget); + tewidget->setBlendColor(tqRgba(0, 0, 0, 0xff)); } tewidget->setColorTable(s->table()); @@ -3749,7 +3749,7 @@ void Konsole::attachSession(TESession* session) } TQString title=session->Title(); - KRadioAction *ra = new KRadioAction(title.replace('&',"&&"), session->IconName(), + KRadioAction *ra = new KRadioAction(title.tqreplace('&',"&&"), session->IconName(), 0, this, TQT_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); @@ -3811,7 +3811,7 @@ void Konsole::slotRenameSession(TESession* ses, const TQString &name) { KRadioAction *ra = session2action.find(ses); TQString title=name; - title=title.replace('&',"&&"); + title=title.tqreplace('&',"&&"); ra->setText(title); ra->setIcon( ses->IconName() ); // I don't know why it is needed here if (m_tabViewMode!=ShowIconOnly) @@ -4192,7 +4192,7 @@ void Konsole::toggleBidi() TQPtrList<TEWidget> tes = activeTEs(); for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { _te->setBidiEnabled(b_bidiEnabled); - _te->repaint(); + _te->tqrepaint(); } } diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 620a0ebdb..b251007d1 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -76,12 +76,12 @@ konsoleFactory::~konsoleFactory() s_aboutData = 0; } -KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const char *widgetName, +KParts::Part *konsoleFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList&) { -// kdDebug(1211) << "konsoleFactory::createPart parentWidget=" << parentWidget << " parent=" << parent << endl; - KParts::Part *obj = new konsolePart(parentWidget, widgetName, parent, name, classname); +// kdDebug(1211) << "konsoleFactory::createPart tqparentWidget=" << tqparentWidget << " parent=" << parent << endl; + KParts::Part *obj = new konsolePart(tqparentWidget, widgetName, parent, name, classname); return obj; } @@ -97,7 +97,7 @@ KInstance *konsoleFactory::instance() #define DEFAULT_HISTORY_SIZE 1000 -konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname) +konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname) : KParts::ReadOnlyPart(parent, name) ,te(0) ,se(0) @@ -120,7 +120,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje ,m_histSize(DEFAULT_HISTORY_SIZE) ,m_runningShell( false ) { - parentWidget=_parentWidget; + tqparentWidget=_tqparentWidget; setInstance(konsoleFactory::instance()); m_extension = new konsoleBrowserExtension(this); @@ -137,7 +137,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje const char* shell = getenv("SHELL"); if (shell == NULL || *shell == '\0') shell = "/bin/sh"; eargs.append(shell); - te = new TEWidget(parentWidget,widgetName); + te = new TEWidget(tqparentWidget,widgetName); te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget setWidget(te); @@ -197,7 +197,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje KeyTrans* ktr = kt_map[*it]; assert( ktr ); TQString title=ktr->hdr(); - m_keytab->insertItem(title.replace('&',"&&"),ktr->numb()); + m_keytab->insertItem(title.tqreplace('&',"&&"),ktr->numb()); } } @@ -317,13 +317,13 @@ void konsolePart::makeGUI() if (!kapp->authorizeKAction("konsole_rmb")) return; - actions = new KActionCollection( (KMainWindow*)parentWidget ); - settingsActions = new KActionCollection( (KMainWindow*)parentWidget ); + actions = new KActionCollection( (KMainWindow*)tqparentWidget ); + settingsActions = new KActionCollection( (KMainWindow*)tqparentWidget ); // Send Signal Menu ------------------------------------------------------------- if (kapp->authorizeKAction("send_signal")) { - m_signals = new KPopupMenu((KMainWindow*)parentWidget); + m_signals = new KPopupMenu((KMainWindow*)tqparentWidget); m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP); m_signals->insertItem( i18n( "&Continue Task" ) + " (CONT)", SIGCONT); m_signals->insertItem( i18n( "&Hangup" ) + " (HUP)", SIGHUP); @@ -338,7 +338,7 @@ void konsolePart::makeGUI() // Settings Menu ---------------------------------------------------------------- if (kapp->authorizeKAction("settings")) { - m_options = new KPopupMenu((KMainWindow*)parentWidget); + m_options = new KPopupMenu((KMainWindow*)tqparentWidget); // Scrollbar selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this, @@ -379,7 +379,7 @@ void konsolePart::makeGUI() // Keyboard Options Menu --------------------------------------------------- if (kapp->authorizeKAction("keyboard")) { - m_keytab = new KPopupMenu((KMainWindow*)parentWidget); + m_keytab = new KPopupMenu((KMainWindow*)tqparentWidget); m_keytab->setCheckable(true); connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); @@ -388,7 +388,7 @@ void konsolePart::makeGUI() // Schema Options Menu ----------------------------------------------------- if (kapp->authorizeKAction("schema")) { - m_schema = new KPopupMenu((KMainWindow*)parentWidget); + m_schema = new KPopupMenu((KMainWindow*)tqparentWidget); m_schema->setCheckable(true); connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); @@ -452,7 +452,7 @@ void konsolePart::makeGUI() } // Popup Menu ------------------------------------------------------------------- - m_popupMenu = new KPopupMenu((KMainWindow*)parentWidget); + m_popupMenu = new KPopupMenu((KMainWindow*)tqparentWidget); KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, te, TQT_SLOT(setSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_popupMenu); @@ -590,7 +590,7 @@ void konsolePart::readProperties() rootxpm = new KRootPixmap(te); rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b())); rootxpm->start(); - rootxpm->repaint(true); + rootxpm->tqrepaint(true); } else { if (rootxpm) { @@ -598,7 +598,7 @@ void konsolePart::readProperties() delete rootxpm; rootxpm=0; } - pixmap_menu_activated(sch->alignment()); + pixmap_menu_activated(sch->tqalignment()); } te->setBellMode(n_bell); @@ -733,7 +733,7 @@ void konsolePart::updateSchemaMenu() for (int i = 0; i < (int) colors->count(); i++) { ColorSchema* s = (ColorSchema*)colors->at(i); TQString title=s->title(); - m_schema->insertItem(title.replace('&',"&&"),s->numb(),0); + m_schema->insertItem(title.tqreplace('&',"&&"),s->numb(),0); } if (te && se) { @@ -778,7 +778,7 @@ void konsolePart::setSchema(ColorSchema* s) rootxpm = new KRootPixmap(te); rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b())); rootxpm->start(); - rootxpm->repaint(true); + rootxpm->tqrepaint(true); } else { if (rootxpm) { @@ -786,7 +786,7 @@ void konsolePart::setSchema(ColorSchema* s) delete rootxpm; rootxpm=0; } - pixmap_menu_activated(s->alignment()); + pixmap_menu_activated(s->tqalignment()); } te->setColorTable(s->table()); @@ -797,8 +797,8 @@ void konsolePart::notifySize(int /* columns */, int /* lines */) { ColorSchema *sch=colors->find(s_schema); - if (sch && sch->alignment() >= 3) - pixmap_menu_activated(sch->alignment()); + if (sch && sch->tqalignment() >= 3) + pixmap_menu_activated(sch->tqalignment()); } void konsolePart::pixmap_menu_activated(int item) @@ -847,7 +847,7 @@ void konsolePart::pixmap_menu_activated(int item) void konsolePart::slotHistoryType() { if ( ! se ) return; - HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)parentWidget); + HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)tqparentWidget); if (dlg.exec()) { if (dlg.isOn()) { if (dlg.nbLines() > 0) { @@ -917,7 +917,7 @@ void konsolePart::slotWordSeps() { bool ok; TQString seps = KInputDialog::getText( i18n( "Word Connectors" ), - i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, parentWidget ); + i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, tqparentWidget ); if ( ok ) { s_word_seps = seps; @@ -1077,7 +1077,7 @@ bool konsolePart::setPtyFd( int master_pty ) void konsolePart::newSession() { if ( se ) delete se; - se = new TESession(te, "xterm", parentWidget->winId()); + se = new TESession(te, "xterm", tqparentWidget->winId()); connect( se,TQT_SIGNAL(done(TESession*)), this,TQT_SLOT(doneSession(TESession*)) ); connect( se,TQT_SIGNAL(openURLRequest(const TQString &)), @@ -1107,7 +1107,7 @@ void konsolePart::newSession() // se->run(); connect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); // setFont( n_font ); // we do this here, to make TEWidget recalculate - // its geometry.. + // its tqgeometry.. } void konsolePart::showShellInDir( const TQString& dir ) @@ -1125,7 +1125,7 @@ void konsolePart::showShellInDir( const TQString& dir ) { TQString text = dir; KRun::shellQuote(text); - text = TQString::fromLatin1("cd ") + text + '\n'; + text = TQString::tqfromLatin1("cd ") + text + '\n'; te->emitText( text ); }; } diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h index 1f65106ad..db7533178 100644 --- a/konsole/konsole/konsole_part.h +++ b/konsole/konsole/konsole_part.h @@ -52,7 +52,7 @@ public: konsoleFactory(); virtual ~konsoleFactory(); - virtual KParts::Part* createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, + virtual KParts::Part* createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, const char* classname = "KParts::Part", const TQStringList &args = TQStringList()); @@ -70,7 +70,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public { Q_OBJECT public: - konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0); + konsolePart(TQWidget *tqparentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0); virtual ~konsolePart(); signals: @@ -140,7 +140,7 @@ signals: bool doWriteStream( const TQByteArray& ); bool doCloseStream(); - TQWidget* parentWidget; + TQWidget* tqparentWidget; TEWidget* te; TESession* se; ColorSchemaList* colors; diff --git a/konsole/konsole/konsole_wcwidth.cpp b/konsole/konsole/konsole_wcwidth.cpp index 73d7c7131..63abe8dd1 100644 --- a/konsole/konsole/konsole_wcwidth.cpp +++ b/konsole/konsole/konsole_wcwidth.cpp @@ -19,7 +19,7 @@ struct interval { }; /* auxiliary function for binary search in interval table */ -static int bisearch(Q_UINT16 ucs, const struct interval *table, int max) { +static int bisearch(TQ_UINT16 ucs, const struct interval *table, int max) { int min = 0; int mid; @@ -65,11 +65,11 @@ static int bisearch(Q_UINT16 ucs, const struct interval *table, int max) { * ISO 8859-1 and WGL4 characters, Unicode control characters, * etc.) have a column width of 1. * - * This implementation assumes that Q_UINT16 characters are encoded + * This implementation assumes that TQ_UINT16 characters are encoded * in ISO 10646. */ -int konsole_wcwidth_normal(Q_UINT16 ucs) +int konsole_wcwidth_normal(TQ_UINT16 ucs) { /* sorted list of non-overlapping intervals of non-spacing characters */ static const struct interval combining[] = { @@ -143,7 +143,7 @@ int konsole_wcwidth_normal(Q_UINT16 ucs) * encodings who want to migrate to UCS. It is not otherwise * recommended for general use. */ -int konsole_wcwidth_cjk(Q_UINT16 ucs) +int konsole_wcwidth_cjk(TQ_UINT16 ucs) { /* sorted list of non-overlapping intervals of East Asian Ambiguous * characters */ @@ -214,13 +214,13 @@ int string_width( const TQString &txt ) int w = 0; for ( uint i = 1; i < txt.length(); ++i ) { - w += konsole_wcwidth(txt[i].unicode()); + w += konsole_wcwidth(txt[i].tqunicode()); } return w; } -int konsole_wcwidth(Q_UINT16 ucs) { +int konsole_wcwidth(TQ_UINT16 ucs) { static int use_wcwidth_cjk = (getenv("KONSOLE_WCWIDTH_CJK")) ? 1: 0; diff --git a/konsole/konsole/konsole_wcwidth.h b/konsole/konsole/konsole_wcwidth.h index b070beb02..a7ca9ad4f 100644 --- a/konsole/konsole/konsole_wcwidth.h +++ b/konsole/konsole/konsole_wcwidth.h @@ -9,8 +9,8 @@ #include <tqglobal.h> #include <tqstring.h> -int konsole_wcwidth(Q_UINT16 ucs); -//int konsole_wcwidth_cjk(Q_UINT16 ucs); +int konsole_wcwidth(TQ_UINT16 ucs); +//int konsole_wcwidth_cjk(TQ_UINT16 ucs); int string_width( const TQString &txt ); diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp index 0686cfbf1..25a71d4e9 100644 --- a/konsole/konsole/konsolebookmarkmenu.cpp +++ b/konsole/konsole/konsolebookmarkmenu.cpp @@ -90,14 +90,14 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() addNewFolder(); } - KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); + KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup(); Q_ASSERT(!parentBookmark.isNull()); bool separatorInserted = false; for ( KBookmark bm = parentBookmark.first(); !bm.isNull(); bm = parentBookmark.next(bm) ) { TQString text = bm.text(); - text.replace( '&', "&&" ); + text.tqreplace( '&', "&&" ); if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark m_parentMenu->insertSeparator(); separatorInserted = true; diff --git a/konsole/konsole/linefont.h b/konsole/konsole/linefont.h index 9873c43d4..a68457023 100644 --- a/konsole/konsole/linefont.h +++ b/konsole/konsole/linefont.h @@ -1,7 +1,7 @@ // WARNING: Autogenerated by "fontembedder ./linefont.src". // You probably do not want to hand-edit this! -static const Q_UINT32 LineChars[] = { +static const TQ_UINT32 LineChars[] = { 0x00007c00, 0x000fffe0, 0x00421084, 0x00e739ce, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00427000, 0x004e7380, 0x00e77800, 0x00ef7bc0, 0x00421c00, 0x00439ce0, 0x00e73c00, 0x00e7bde0, 0x00007084, 0x000e7384, 0x000079ce, 0x000f7bce, diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 7be5e5146..a14372ce2 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -324,7 +324,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) TQString term = ""; if(args->isSet("tn")) { - term=TQString::fromLatin1(args->getOption("tn")); + term=TQString::tqfromLatin1(args->getOption("tn")); } login_shell = args->isSet("ls"); @@ -644,13 +644,13 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) //// Temporary code, waiting for Qt to do this properly // Delete all toplevel widgets that have WDestructiveClose - TQWidgetList *list = TQApplication::topLevelWidgets(); + TQWidgetList *list = TQApplication::tqtopLevelWidgets(); // remove all toplevel widgets that have a parent (i.e. they // got WTopLevel explicitly), they'll be deleted by the parent list->first(); while( list->current()) { - if( list->current()->parentWidget() != NULL || !list->current()->testWFlags( Qt::WDestructiveClose ) ) + if( list->current()->tqparentWidget() != NULL || !list->current()->testWFlags( Qt::WDestructiveClose ) ) { list->remove(); continue; diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 8d85329eb..825d13efe 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -101,7 +101,7 @@ static const char *colornames[TABLE_COLORS] = static const ColorEntry default_table[TABLE_COLORS] = // The following are almost IBM standard color codes, with some slight // gamma correction for the dim colors to compensate for bright X screens. - // It contains the 8 ansiterm/xterm colors in 2 intensities. + // It tqcontains the 8 ansiterm/xterm colors in 2 intensities. { ColorEntry( TQColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( TQColor(0xFF,0xFF,0xFF), 1, 0 ), // Dfore, Dback @@ -131,7 +131,7 @@ ColorSchema::ColorSchema(const TQString& pathname) ,lastRead(new TQDateTime()) { //start with a valid time, aleXXX - *lastRead = TQDateTime::currentDateTime(); + *lastRead = TQDateTime::tqcurrentDateTime(); TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname); if (fPath.isEmpty() || !TQFile::exists(fPath)) { @@ -169,7 +169,7 @@ ColorSchema::ColorSchema(KConfig& c) m_title = c.readEntry("Title",i18n("[no title]")); m_imagePath = c.readEntry("ImagePath"); - m_alignment = c.readNumEntry("ImageAlignment",1); + m_tqalignment = c.readNumEntry("ImageAlignment",1); m_useTransparency = c.readBoolEntry("UseTransparency",false); m_tr_r = c.readNumEntry("TransparentR",0); @@ -203,7 +203,7 @@ void ColorSchema::clearSchema() } m_title = i18n("[no title]"); m_imagePath = ""; - m_alignment = 1; + m_tqalignment = 1; m_useTransparency = false; m_tr_x = 0.0; m_tr_r = 0; @@ -216,7 +216,7 @@ void ColorSchema::setDefaultSchema() m_numb = 0; m_title = i18n("Konsole Default"); m_imagePath = ""; // background pixmap - m_alignment = 1; // none + m_tqalignment = 1; // none m_useTransparency = false; // not use pseudo-transparency by default m_tr_r = m_tr_g = m_tr_b = 0; // just to be on the safe side m_tr_x = 0.0; @@ -273,7 +273,7 @@ void ColorSchema::writeConfig(const TQString& path) const c.setGroup("SchemaGeneral"); c.writeEntry("Title",m_title); c.writeEntry("ImagePath",m_imagePath); - c.writeEntry("ImageAlignment",m_alignment); + c.writeEntry("ImageAlignment",m_tqalignment); c.writeEntry("UseTransparency",m_useTransparency); c.writeEntry("TransparentR",m_tr_r); @@ -313,7 +313,7 @@ bool ColorSchema::rereadSchemaFile() char line[100]; - *lastRead = TQDateTime::currentDateTime(); + *lastRead = TQDateTime::tqcurrentDateTime(); while (fscanf(sysin,"%80[^\n]\n",line) > 0) { @@ -334,7 +334,7 @@ bool ColorSchema::rereadSchemaFile() TQString qline(line); m_imagePath = locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) ); - m_alignment = attr; + m_tqalignment = attr; } if (!strncmp(line,"transparency",12)) { float rx; @@ -615,7 +615,7 @@ bool ColorSchemaList::checkSchemas() // now. // // - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); r = updateAllSchemaTimes(now); diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h index 904767df6..42cdfe1ed 100644 --- a/konsole/konsole/schema.h +++ b/konsole/konsole/schema.h @@ -150,7 +150,7 @@ protected: int numb() {if (!m_fileRead) rereadSchemaFile();return m_numb;}; const TQString& title() {if (!m_fileRead) rereadSchemaFile();return m_title;}; const TQString& imagePath() {if (!m_fileRead) rereadSchemaFile();return m_imagePath;}; - int alignment() {if (!m_fileRead) rereadSchemaFile();return m_alignment;}; + int tqalignment() {if (!m_fileRead) rereadSchemaFile();return m_tqalignment;}; const ColorEntry* table() {if (!m_fileRead) rereadSchemaFile();return m_table;}; bool useTransparency() {if (!m_fileRead) rereadSchemaFile();return m_useTransparency;}; double tr_x() {if (!m_fileRead) rereadSchemaFile();return m_tr_x;}; @@ -162,7 +162,7 @@ protected: private: int m_numb; int m_tr_r, m_tr_g, m_tr_b; - int m_alignment; + int m_tqalignment; TQString m_title; TQString m_imagePath; ColorEntry m_table[TABLE_COLORS]; @@ -234,7 +234,7 @@ private: /** * This isn't really used, but it could be. A newly - * constructed ColorSchemaList contains one element: + * constructed ColorSchemaList tqcontains one element: * the defaultSchema, with serial number 0. */ ColorSchema *defaultSchema; diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp index 53990af2f..a4d8ff4f5 100644 --- a/konsole/konsole/session.cpp +++ b/konsole/konsole/session.cpp @@ -133,11 +133,11 @@ void TESession::ptyError() { // FIXME: sh->error() is always empty if ( sh->error().isEmpty() ) - KMessageBox::error( te->topLevelWidget(), + KMessageBox::error( te->tqtopLevelWidget(), i18n("Konsole is unable to open a PTY (pseudo teletype). It is likely that this is due to an incorrect configuration of the PTY devices. Konsole needs to have read/write access to the PTY devices."), i18n("A Fatal Error Has Occurred") ); else - KMessageBox::error(te->topLevelWidget(), sh->error()); + KMessageBox::error(te->tqtopLevelWidget(), sh->error()); emit done(this); } @@ -232,7 +232,7 @@ void TESession::setUserTitle( int what, const TQString &caption ) renameSession(caption); if (what == 31) { cwd=caption; - cwd=cwd.replace( TQRegExp("^~"), TQDir::homeDirPath() ); + cwd=cwd.tqreplace( TQRegExp("^~"), TQDir::homeDirPath() ); emit openURLRequest(cwd); } if (what == 32) { // change icon via \033]32;Icon\007 @@ -637,7 +637,7 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T connect(zmodemProc,TQT_SIGNAL (receivedStdout (KProcess *, char *, int)), this, TQT_SLOT(zmodemSendBlock(KProcess *, char *, int))); connect(zmodemProc,TQT_SIGNAL (receivedStderr (KProcess *, char *, int)), - this, TQT_SLOT(zmodemStatus(KProcess *, char *, int))); + this, TQT_SLOT(zmodemtqStatus(KProcess *, char *, int))); connect(zmodemProc,TQT_SIGNAL (processExited(KProcess *)), this, TQT_SLOT(zmodemDone())); @@ -645,7 +645,7 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) ); connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); - zmodemProgress = new ZModemDialog(te->topLevelWidget(), false, + zmodemProgress = new ZModemDialog(te->tqtopLevelWidget(), false, i18n("ZModem Progress")); connect(zmodemProgress, TQT_SIGNAL(user1Clicked()), @@ -671,7 +671,7 @@ void TESession::zmodemContinue() // qWarning("ZModem resume"); } -void TESession::zmodemStatus(KProcess *, char *data, int len) +void TESession::zmodemtqStatus(KProcess *, char *data, int len) { TQCString msg(data, len+1); while(!msg.isEmpty()) @@ -767,7 +767,7 @@ QCStringList TESession::functionsDynamic() void TESession::onRcvBlock( const char* buf, int len ) { em->onRcvBlock( buf, len ); - emit receivedData( TQString::fromLatin1( buf, len ) ); + emit receivedData( TQString::tqfromLatin1( buf, len ) ); } void TESession::print( TQPainter &paint, bool friendly, bool exact ) diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h index cbe41ab50..69be6cb86 100644 --- a/konsole/konsole/session.h +++ b/konsole/konsole/session.h @@ -137,7 +137,7 @@ public slots: void slotZModemDetected(); void emitZModemDetected(); - void zmodemStatus(KProcess *, char *data, int len); + void zmodemtqStatus(KProcess *, char *data, int len); void zmodemSendBlock(KProcess *, char *data, int len); void zmodemRcvBlock(const char *data, int len); void zmodemDone(); diff --git a/konsole/kwrited.desktop b/konsole/kwrited.desktop index d5bc977c4..61da36e0e 100644 --- a/konsole/kwrited.desktop +++ b/konsole/kwrited.desktop @@ -79,7 +79,7 @@ Comment[be]=Назірае за паведамленнямі ад мясцовы Comment[bg]=Наблюдение за съобщения от локални потребители, изпратени с write(1) или wall(1) Comment[bs]=Prati poruke od lokalnih korisnika poslane koristeći write(1) ili wall(1) Comment[ca]=Fes atenció als missatges dels usuaris locals enviats amb write(1) o wall(1) -Comment[cs]=Sledování zpráv od místních uživatelů poslaných pomocí write(1) nebo wall(1) +Comment[cs]=Sledování zpráv od místních uživatelů poslaných potqmocí write(1) nebo wall(1) Comment[csb]=Dozérô wiadłów òd môlowëch brëkòwników wësłónëch przez write(1) abò wall(1) Comment[cy]=Gwylio am negeseuon oddiwrth defnyddwyr lleol a anfonwyd efo write(1) neu wall(1) Comment[da]=Kig efter beskeder fra lokale brugere sendt med write(1) eller wall(1) @@ -116,14 +116,14 @@ Comment[ne]=सन्देशका लागि स्थानीय प्� Comment[nl]=Observeer berichten van lokale gebruikers verzonden met write(1) of wall(1) Comment[nn]=Sjå etter meldingar frå lokale brukarar sende med write(1) eller wall(1) Comment[pa]=ਸਥਾਨਕ ਉਪਭੋਗੀ ਰਾਹੀਂ write(1) or wall(1) ਨਾਲ ਭੇਜੇ ਸੁਨੇਹੇ ਵੇਖੋ -Comment[pl]=Śledzi wiadomości od użytkowników lokalnych wysyłane za pomocą write(1) lub wall(1) +Comment[pl]=Śledzi wiadomości od użytkowników lokalnych wysyłane za potqmocą write(1) lub wall(1) Comment[pt]=Escutar as mensagens dos utilizadores locais, enviadas com o write(1) ou o wall(1) Comment[pt_BR]=Observa mensagens de usuários locais, enviadas com o write(1) ou o wall(1) Comment[ro]=Așteaptă mesaje de la utilizatori, trimise cu write(1) sau wall(1) Comment[ru]=Приём сообщения пользователей локальной сети, отправленных командами write(1) или wall(1) Comment[rw]=Kugenzura ubutumwa buva ku bakoresha bahafi bwoherejwe hakoreshejwe kwandika(1) cyangwa urukuta(1) Comment[se]=Gozit dieđuid mat báikkalaš geavaheaddjit sáddejit «write» dahje «wall» -Comment[sk]=Sledovanie správ od lokálnych používateľov poslaných pomocou príkazu write (1) alebo wall (1) +Comment[sk]=Sledovanie správ od lokálnych používateľov poslaných potqmocou príkazu write (1) alebo wall (1) Comment[sl]=Opazuj sporočila od krajevnih uporabnikov, poslanih z write(1) ali wall(1) Comment[sr]=Чека поруке од локалних корисника послатих помоћу write(1) или wall(1) Comment[sr@Latn]=Čeka poruke od lokalnih korisnika poslatih pomoću write(1) ili wall(1) diff --git a/konsole/tests/esc.c b/konsole/tests/esc.c index 520946b50..c8837409e 100644 --- a/konsole/tests/esc.c +++ b/konsole/tests/esc.c @@ -81,7 +81,7 @@ decswl() { /* Single With Line */ dectst(pn) int pn; { /* Invoke Confidence Test */ brc2(2, pn, 'y'); } -dsr(pn) int pn; { /* Device Status Report */ +dsr(pn) int pn; { /* Device tqStatus Report */ brc(pn, 'n'); } ed(pn) int pn; { /* Erase in Display */ diff --git a/konsole/tests/main.c b/konsole/tests/main.c index c80b0426c..87a288056 100644 --- a/konsole/tests/main.c +++ b/konsole/tests/main.c @@ -534,7 +534,7 @@ tst_keyboard() { - DECKPAM (Keypad Application Mode) - DECKPNM (Keypad Numeric Mode) -The standard VT100 keayboard layout: +The standard VT100 keayboard tqlayout: UP DN LE RI @@ -562,7 +562,7 @@ TAB* qQ wW eE rR tT yY uU iI oO pP [{ ]} DEL char *ledmsg[6], *ledseq[6]; int i, j, okflag; - int kblayout; + int kbtqlayout; int ckeymode; int fkeymode; char kbdc; @@ -768,10 +768,10 @@ TAB* qQ wW eE rR tT yY uU iI oO pP [{ ]} DEL }; static char *keyboardmenu[] = { - "Standard American ASCII layout", - "Swedish national layout D47", - "Swedish national layout E47", - /* add new keyboard layouts here */ + "Standard American ASCII tqlayout", + "Swedish national tqlayout D47", + "Swedish national tqlayout E47", + /* add new keyboard tqlayouts here */ "" }; @@ -833,16 +833,16 @@ TAB* qQ wW eE rR tT yY uU iI oO pP [{ ]} DEL ed(2); cup(5,10); - println("Choose keyboard layout:"); - kblayout = menu(keyboardmenu); - if (kblayout) { - kblayout--; - for (j = 0; natkeytab[kblayout][j].natc != '\0'; j++) { + println("Choose keyboard tqlayout:"); + kbtqlayout = menu(keyboardmenu); + if (kbtqlayout) { + kbtqlayout--; + for (j = 0; natkeytab[kbtqlayout][j].natc != '\0'; j++) { for (i = 0; keytab[i].c != '\0'; i++) { - if (keytab[i].row == natkeytab[kblayout][j].natrow && - keytab[i].col == natkeytab[kblayout][j].natcol) { - keytab[i].c = natkeytab[kblayout][j].natc; - keytab[i].symbol = natkeytab[kblayout][j].natsymbol; + if (keytab[i].row == natkeytab[kbtqlayout][j].natrow && + keytab[i].col == natkeytab[kbtqlayout][j].natcol) { + keytab[i].c = natkeytab[kbtqlayout][j].natc; + keytab[i].symbol = natkeytab[kbtqlayout][j].natsymbol; break; } } @@ -1102,7 +1102,7 @@ tst_reports() { /* Test of: <ENQ> (AnswerBack Message) SM RM (Set/Reset Mode) - LineFeed / Newline - DSR (Device Status Report) + DSR (Device tqStatus Report) DA (Device Attributes) DECREQTPARM (Request Terminal Parameters) */ @@ -1204,7 +1204,7 @@ tst_reports() { ed(2); cup(1,1); - printf("Test of Device Status Report 5 (report terminal status)."); + printf("Test of Device tqStatus Report 5 (report terminal status)."); cup(2,1); dsr(5); report = instr(); @@ -1217,7 +1217,7 @@ tst_reports() { else printf(" -- Unknown response!"); cup(4,1); - println("Test of Device Status Report 6 (report cursor position)."); + println("Test of Device tqStatus Report 6 (report cursor position)."); cup(5,1); dsr(6); report = instr(); @@ -1445,7 +1445,7 @@ tst_vt52() { tst_insdel() { /* Test of: - SM/RM(4) (= IRM (Insertion/replacement mode)) + SM/RM(4) (= IRM (Insertion/tqreplacement mode)) ICH (Insert Character) DCH (Delete character) IL (Insert line) diff --git a/konsole/tests/vttest.1 b/konsole/tests/vttest.1 index c4104925d..af0558cd9 100644 --- a/konsole/tests/vttest.1 +++ b/konsole/tests/vttest.1 @@ -9,5 +9,5 @@ is a program designed to test the functionality of a VT100 terminal (or emulator thereof). It tests both display (escape sequence handling) and keyboard. .PP -The program is menu\-driven and contains full on\-line operating +The program is menu\-driven and tqcontains full on\-line operating instructions. |