diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
| commit | a374efce3a207b39514be3c52264091400ce297e (patch) | |
| tree | 77bdf654b55826d4f59b53a5621310206bcaead1 /ktouch | |
| parent | f81a494f3957d5cf38c787973415597941934727 (diff) | |
| download | tdeedu-a374efce3a207b39514be3c52264091400ce297e.tar.gz tdeedu-a374efce3a207b39514be3c52264091400ce297e.zip | |
TQt4 port kdeedu
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ktouch')
90 files changed, 771 insertions, 760 deletions
diff --git a/ktouch/ChangeLog b/ktouch/ChangeLog index 52a4a866..f8d02b6a 100644 --- a/ktouch/ChangeLog +++ b/ktouch/ChangeLog @@ -13,7 +13,7 @@ color scheme includes now keyboard and slide line colors, new option to have common slide line colors in configuration (request: #90548) - * Bugfix: several keyboard layouts were wrong (showing the + * Bugfix: several keyboard tqlayouts were wrong (showing the wrong colors and were therefore misleading), a few have been already fixed and the others temporarily removed from the install section of the make files @@ -33,7 +33,7 @@ (bug report: * Feature: default keyboard is selected based on KDE locale (requests: #54379, #99947) - * Feature: quick select lists of training lectures/keyboard layouts are now + * Feature: quick select lists of training lectures/keyboard tqlayouts are now sorted alphabetically * Bugfix: trailing spaces are removed from lines when lecture is read (bug: #107080) @@ -55,7 +55,7 @@ * Bugfix: fixed false error on reading single-level-lectures (bug: #120414) * Feature: lines with spaces at the end are trimmed (whitespace removed) * Feature: line length limit increased to 300 (request: #116838) - * Added: added new/fixed keyboard layouts + * Added: added new/fixed keyboard tqlayouts (requests: #40962, #85584, #119670) 2006-03-27 Andreas Nicolai <andreas.nicolai@gmx.net> @@ -81,7 +81,7 @@ * Bugfixes: sliding line typing limit, removed mid-level advance (due to popular request) reset session stats in every new level - * Added: new keyboard layout for switzerland-german keyboards + * Added: new keyboard tqlayout for switzerland-german keyboards 2004-11-02 Andreas Nicolai <andreas.nicolai@gmx.net> * Added: checks in the quick-select menues @@ -126,7 +126,7 @@ 2004-04-02 Andreas Nicolai <andreas.nicolai@gmx.net> (develop) - * Fixed a bug in ktouch.cpp (wrong slots type) + * Fixed a bug in ktouch.cpp (wrong Q_SLOTS type) * Cleaned up some files 2003-05-19 Haavard Froeiland <haavard@users.sourceforge.net> @@ -240,7 +240,7 @@ (new version) * ktouch 0.60 is out * new features: - Change between different keyboard layouts. Supported keyboard's is English, German and Norwegian. + Change between different keyboard tqlayouts. Supported keyboard's is English, German and Norwegian. 2000-05-09 Haavard Froeiland <haavard@users.sourceforge.net> diff --git a/ktouch/extras/training-gen/perl/dk.config b/ktouch/extras/training-gen/perl/dk.config index 409a07ca..46d7edd6 100644 --- a/ktouch/extras/training-gen/perl/dk.config +++ b/ktouch/extras/training-gen/perl/dk.config @@ -16,4 +16,4 @@ wn cæ x ,. -ABCDEFGHIJKLMNOPQRSTUVWYZÆØÅ
\ No newline at end of file +ABCDEFGHIJKLMNOPTQRSTUVWYZÆØÅ
\ No newline at end of file diff --git a/ktouch/extras/training-gen/perl/en.config b/ktouch/extras/training-gen/perl/en.config index bb5df1ae..cca13468 100644 --- a/ktouch/extras/training-gen/perl/en.config +++ b/ktouch/extras/training-gen/perl/en.config @@ -12,4 +12,4 @@ qu wn cx yz -ABCDEFGHIJKLMNOPQRSTUVWXYZ +ABCDEFGHIJKLMNOPTQRSTUVWXYZ diff --git a/ktouch/extras/training-gen/perl/es.config b/ktouch/extras/training-gen/perl/es.config index 49b8b32d..1efd7b72 100644 --- a/ktouch/extras/training-gen/perl/es.config +++ b/ktouch/extras/training-gen/perl/es.config @@ -14,4 +14,4 @@ quü wnñ cx yz -ABCDEFGHIJKLMNOPQRSTUVWXYZ +ABCDEFGHIJKLMNOPTQRSTUVWXYZ diff --git a/ktouch/extras/training-gen/python/ktouchgen.py b/ktouch/extras/training-gen/python/ktouchgen.py index 97083c01..47cd54d5 100644 --- a/ktouch/extras/training-gen/python/ktouchgen.py +++ b/ktouch/extras/training-gen/python/ktouchgen.py @@ -35,7 +35,7 @@ from whrandom import randint, random import string -from string import join, maketrans, translate, count, strip, lower, find, upper +from string import join, maketrans, translate, count, strip, lower, tqfind, upper import time import sys import ConfigParser @@ -173,7 +173,7 @@ def main(argv): # Parse the configfile # Creates a List Levelops with [(Options), ] - # Optiontuple contains (lchars, title, rows) + # Optiontuple tqcontains (lchars, title, rows) conf = ConfigParser.ConfigParser() try: file = open(argv[2],'r') diff --git a/ktouch/keyboards/be.keyboard b/ktouch/keyboards/be.keyboard index 3995e5fd..6de3fa0c 100644 --- a/ktouch/keyboards/be.keyboard +++ b/ktouch/keyboards/be.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. #################################################### @@ -38,7 +38,7 @@ ControlKey 8 BackSpace 130 0 20 10 # # NormalKey: These keys are the keys that are visible on the keyboard. To # get the character (unicod) you don't have to press anything else -# but the key. The FingerKey unicode number tells the program +# but the key. The FingerKey tqunicode number tells the program # which finger has to be moved to press this key. # # Unicode KeyText x y FingerKey @@ -90,8 +90,8 @@ NormalKey 61 = 113 30 109 # # HiddenKey: These are actually not "hidden" keys as such, but the characters # that are obtained by pressing a key and a certain modifier key. -# Define the character via its unicode and then also -# the unicode for the base character on the key to be pressed. +# Define the character via its tqunicode and then also +# the tqunicode for the base character on the key to be pressed. # Also define the character/key of the finger that needs to # press the key and the modifier key that needs to be highlighted. # diff --git a/ktouch/keyboards/bg.keyboard b/ktouch/keyboards/bg.keyboard index 87a71a62..57c0f657 100644 --- a/ktouch/keyboards/bg.keyboard +++ b/ktouch/keyboards/bg.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/de.keyboard b/ktouch/keyboards/de.keyboard index 170fe821..10d7ac7e 100644 --- a/ktouch/keyboards/de.keyboard +++ b/ktouch/keyboards/de.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for german keybord layout +# Keybord tqlayout file for german keybord tqlayout # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/de.neo.keyboard b/ktouch/keyboards/de.neo.keyboard index 9f2c883e..6fce086a 100644 --- a/ktouch/keyboards/de.neo.keyboard +++ b/ktouch/keyboards/de.neo.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/de.swiss.keyboard b/ktouch/keyboards/de.swiss.keyboard index 95c494db..d02d2826 100644 --- a/ktouch/keyboards/de.swiss.keyboard +++ b/ktouch/keyboards/de.swiss.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for german kaybord layout +# Keybord tqlayout file for german kaybord tqlayout # Adaptiert für schweizedeutsche Tastatur 17.9.04 Hansueli Eggimann # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. diff --git a/ktouch/keyboards/dk.keyboard b/ktouch/keyboards/dk.keyboard index 7b781aa8..23f7128e 100644 --- a/ktouch/keyboards/dk.keyboard +++ b/ktouch/keyboards/dk.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Danish kaybord +# Keybord tqlayout file for Danish kaybord # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/dvorak_fr.keyboard b/ktouch/keyboards/dvorak_fr.keyboard index 6b90ed3e..f80bdffe 100644 --- a/ktouch/keyboards/dvorak_fr.keyboard +++ b/ktouch/keyboards/dvorak_fr.keyboard @@ -1,7 +1,7 @@ # -*- coding: utf-8; -*- #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # Matthieu MOY, December 7th 2004 diff --git a/ktouch/keyboards/ee.keyboard b/ktouch/keyboards/ee.keyboard index bd2a880e..7e79a353 100644 --- a/ktouch/keyboards/ee.keyboard +++ b/ktouch/keyboards/ee.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/en.dvorak.keyboard b/ktouch/keyboards/en.dvorak.keyboard index d191f544..295d4f43 100644 --- a/ktouch/keyboards/en.dvorak.keyboard +++ b/ktouch/keyboards/en.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/en.keyboard b/ktouch/keyboards/en.keyboard index c0e9f2d1..84a3f31b 100644 --- a/ktouch/keyboards/en.keyboard +++ b/ktouch/keyboards/en.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. #################################################### @@ -38,7 +38,7 @@ ControlKey 8 BackSpace 140 0 10 10 # # NormalKey: These keys are the keys that are visible on the keyboard. To # get the character (unicod) you don't have to press anything else -# but the key. The FingerKey unicode number tells the program +# but the key. The FingerKey tqunicode number tells the program # which finger has to be moved to press this key. # # Unicode KeyText x y FingerKey @@ -89,8 +89,8 @@ NormalKey 47 / 113 30 59 # # HiddenKey: These are actually not "hidden" keys as such, but the characters # that are obtained by pressing a key and a certain modifier key. -# Define the character via its unicode and then also -# the unicode for the base character on the key to be pressed. +# Define the character via its tqunicode and then also +# the tqunicode for the base character on the key to be pressed. # Also define the character/key of the finger that needs to # press the key and the modifier key that needs to be highlighted. # diff --git a/ktouch/keyboards/es.dvorak.keyboard b/ktouch/keyboards/es.dvorak.keyboard index 2dd84046..56da935b 100644 --- a/ktouch/keyboards/es.dvorak.keyboard +++ b/ktouch/keyboards/es.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/es.keyboard b/ktouch/keyboards/es.keyboard index 5211488e..cae885f8 100644 --- a/ktouch/keyboards/es.keyboard +++ b/ktouch/keyboards/es.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/fi.keyboard b/ktouch/keyboards/fi.keyboard index 9edcd996..10775703 100644 --- a/ktouch/keyboards/fi.keyboard +++ b/ktouch/keyboards/fi.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/fr.a.keyboard b/ktouch/keyboards/fr.a.keyboard index d18e4cfb..0916da15 100644 --- a/ktouch/keyboards/fr.a.keyboard +++ b/ktouch/keyboards/fr.a.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/fr.keyboard b/ktouch/keyboards/fr.keyboard index edfcf537..81f54847 100644 --- a/ktouch/keyboards/fr.keyboard +++ b/ktouch/keyboards/fr.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/fr.swiss.keyboard b/ktouch/keyboards/fr.swiss.keyboard index ba89c072..e56f6bf6 100644 --- a/ktouch/keyboards/fr.swiss.keyboard +++ b/ktouch/keyboards/fr.swiss.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for swiss french keybord layout +# Keybord tqlayout file for swiss french keybord tqlayout #################################################### # # Assci KeyText x y diff --git a/ktouch/keyboards/he.keyboard b/ktouch/keyboards/he.keyboard index e03f5bd1..f09db772 100644 --- a/ktouch/keyboards/he.keyboard +++ b/ktouch/keyboards/he.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Hebrew +# Keybord tqlayout file for Hebrew #################################################### # # diff --git a/ktouch/keyboards/hu.keyboard b/ktouch/keyboards/hu.keyboard index afd77ef1..bdf90711 100644 --- a/ktouch/keyboards/hu.keyboard +++ b/ktouch/keyboards/hu.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Hungarian keybord layout file +# Hungarian keybord tqlayout file # Code=UTF-8 #################################################### # diff --git a/ktouch/keyboards/it.keyboard b/ktouch/keyboards/it.keyboard index 3f9c5828..1d99b944 100644 --- a/ktouch/keyboards/it.keyboard +++ b/ktouch/keyboards/it.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/la.keyboard b/ktouch/keyboards/la.keyboard index 55d6c6cd..0094f924 100644 --- a/ktouch/keyboards/la.keyboard +++ b/ktouch/keyboards/la.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Latin keyboard +# Keybord tqlayout file for Latin keyboard #################################################### # # diff --git a/ktouch/keyboards/nb.keyboard b/ktouch/keyboards/nb.keyboard index ca4f503d..13448d50 100644 --- a/ktouch/keyboards/nb.keyboard +++ b/ktouch/keyboards/nb.keyboard @@ -1,11 +1,11 @@ #################################################### # KTouch -# Keybord layout file for Norwegian keyboard +# Keybord tqlayout file for Norwegian keyboard # Encoding: UTF-8 (save as UTF-8 from editor) # Made by Axel Bojer by manipulating the danish file # Edit this file with tabs set to 8 characters. # The Unicode characters are found in an extensive list -# over html codes -- see http://www.fileformat.info/info/unicode/ +# over html codes -- see http://www.fileformat.info/info/tqunicode/ # # Refer to file en.keyboard for details. #################################################### diff --git a/ktouch/keyboards/nn.keyboard b/ktouch/keyboards/nn.keyboard index 79e9675b..c6592195 100644 --- a/ktouch/keyboards/nn.keyboard +++ b/ktouch/keyboards/nn.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Norwegian kaybord +# Keybord tqlayout file for Norwegian kaybord #################################################### # # Assci KeyText x y diff --git a/ktouch/keyboards/pl.keyboard b/ktouch/keyboards/pl.keyboard index 8c5c3590..fbb3961a 100644 --- a/ktouch/keyboards/pl.keyboard +++ b/ktouch/keyboards/pl.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Polish (utf-8) +# Keybord tqlayout file for Polish (utf-8) # Mikolaj Machowski # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. diff --git a/ktouch/keyboards/pt.br.keyboard b/ktouch/keyboards/pt.br.keyboard index be9af86f..fe0e7bd9 100644 --- a/ktouch/keyboards/pt.br.keyboard +++ b/ktouch/keyboards/pt.br.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for brazilian keyboard +# Keybord tqlayout file for brazilian keyboard #################################################### # # diff --git a/ktouch/keyboards/pt.keyboard b/ktouch/keyboards/pt.keyboard index 287c431d..0309d97f 100644 --- a/ktouch/keyboards/pt.keyboard +++ b/ktouch/keyboards/pt.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for portuguese keyboard +# Keybord tqlayout file for portuguese keyboard #################################################### # # diff --git a/ktouch/keyboards/ru.2.keyboard b/ktouch/keyboards/ru.2.keyboard index a3cf2039..c2645a1a 100644 --- a/ktouch/keyboards/ru.2.keyboard +++ b/ktouch/keyboards/ru.2.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/ru.3.keyboard b/ktouch/keyboards/ru.3.keyboard index 24d925a1..af32a33a 100644 --- a/ktouch/keyboards/ru.3.keyboard +++ b/ktouch/keyboards/ru.3.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for Russian +# Keybord tqlayout file for Russian # Miha Ulanov (mulanov@mail.ru) # Code=UTF-8 #################################################### diff --git a/ktouch/keyboards/ru.basic.keyboard b/ktouch/keyboards/ru.basic.keyboard index df3cfb77..15fa4ce8 100644 --- a/ktouch/keyboards/ru.basic.keyboard +++ b/ktouch/keyboards/ru.basic.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian basic keyboard layout file for KTouch. +# Russian basic keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/ru.keyboard b/ktouch/keyboards/ru.keyboard index 651addf8..f249ad83 100644 --- a/ktouch/keyboards/ru.keyboard +++ b/ktouch/keyboards/ru.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian Windows keyboard layout file for KTouch. +# Russian Windows keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/ru.typewriter.keyboard b/ktouch/keyboards/ru.typewriter.keyboard index 67f16032..c57e17ac 100644 --- a/ktouch/keyboards/ru.typewriter.keyboard +++ b/ktouch/keyboards/ru.typewriter.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian typewriter keyboard layout file for KTouch. +# Russian typewriter keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/ru.winkeys.keyboard b/ktouch/keyboards/ru.winkeys.keyboard index 5d412f99..024d1c2c 100644 --- a/ktouch/keyboards/ru.winkeys.keyboard +++ b/ktouch/keyboards/ru.winkeys.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian winkeys keyboard layout file for KTouch. +# Russian winkeys keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/sl.keyboard b/ktouch/keyboards/sl.keyboard index 2f482f39..6918a8ae 100644 --- a/ktouch/keyboards/sl.keyboard +++ b/ktouch/keyboards/sl.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for slovenian keybord layout +# Keybord tqlayout file for slovenian keybord tqlayout # Code=UTF-8 #################################################### # diff --git a/ktouch/keyboards/sv.dvorak.keyboard b/ktouch/keyboards/sv.dvorak.keyboard index acb0acab..e81e1c0b 100644 --- a/ktouch/keyboards/sv.dvorak.keyboard +++ b/ktouch/keyboards/sv.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Swedish Dvorak Keybord layout file +# Swedish Dvorak Keybord tqlayout file #################################################### # # Ascii KeyText x y diff --git a/ktouch/keyboards/sv.keyboard b/ktouch/keyboards/sv.keyboard index 597a315d..9e9ba96c 100644 --- a/ktouch/keyboards/sv.keyboard +++ b/ktouch/keyboards/sv.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file for swedish keybord layout +# Keybord tqlayout file for swedish keybord tqlayout # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/tr.f.keyboard b/ktouch/keyboards/tr.f.keyboard index 92c08944..1953e9d4 100644 --- a/ktouch/keyboards/tr.f.keyboard +++ b/ktouch/keyboards/tr.f.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Turkish F Keybord layout file +# Turkish F Keybord tqlayout file #################################################### # This file distributed without any expressed or implied warranty # Written by Nilgün Belma Bugüner <nilgun at belgeler dot org>, 2005 diff --git a/ktouch/keyboards/tr.q.keyboard b/ktouch/keyboards/tr.q.keyboard index 2fb7e1c2..cfdac334 100644 --- a/ktouch/keyboards/tr.q.keyboard +++ b/ktouch/keyboards/tr.q.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord layout file +# Keybord tqlayout file #################################################### # # diff --git a/ktouch/keyboards/uk.basic.keyboard b/ktouch/keyboards/uk.basic.keyboard index 6ea507c4..c1807e27 100644 --- a/ktouch/keyboards/uk.basic.keyboard +++ b/ktouch/keyboards/uk.basic.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian basic keyboard layout file for KTouch. +# Ukrainian basic keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/uk.typewriter.keyboard b/ktouch/keyboards/uk.typewriter.keyboard index 129ac807..08c88015 100644 --- a/ktouch/keyboards/uk.typewriter.keyboard +++ b/ktouch/keyboards/uk.typewriter.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian typewriter keyboard layout file for KTouch. +# Ukrainian typewriter keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/uk.winkeys.keyboard b/ktouch/keyboards/uk.winkeys.keyboard index d378df30..47d09711 100644 --- a/ktouch/keyboards/uk.winkeys.keyboard +++ b/ktouch/keyboards/uk.winkeys.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian winkeys keyboard layout file for KTouch. +# Ukrainian winkeys keyboard tqlayout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/ktouch.lsm b/ktouch/ktouch.lsm index ab0235d1..9bd6c444 100644 --- a/ktouch/ktouch.lsm +++ b/ktouch/ktouch.lsm @@ -7,7 +7,7 @@ Description: A education program to learn to touch-type. It provieds fingers on the keyboard. It also shows the user which finger to move to press the next key. It automatically adjusts to different levels depending on the speed. It has support - for different keyboard layouts(languages). + for different keyboard tqlayouts(languages). Keywords: touch typing education training Author: haavard@users.sourceforge.net (Haavard Froeiland) Maintained-by: ghorwin@users.sourceforge.net (Andreas Nicolai) diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 632aabe1..4480b80c 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -22,7 +22,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> #include <tqgroupbox.h> -//#include <qimevent.h> +//#include <tqimevent.h> // KDE Header #include <klocale.h> @@ -64,7 +64,7 @@ KTouch::KTouch() m_keyboardWidget(NULL), m_trainer(NULL) { - setFocusPolicy(StrongFocus); + setFocusPolicy(TQ_StrongFocus); setInputMethodEnabled(true); // Set global KTouchPtr to the main KTouch Object @@ -75,7 +75,7 @@ KTouch::KTouch() setupActions(); // create the GUI reading the ui.rc file if (!initialGeometrySet()) - resize( TQSize(700, 510).expandedTo(minimumSizeHint())); + resize( TQSize(700, 510).expandedTo(tqminimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); // Read user statistics @@ -107,7 +107,7 @@ KTouch::KTouch() if (Prefs::currentLectureFile().isNull() || !m_lecture.loadXML(this, Prefs::currentLectureFile() )) { - Prefs::setCurrentLectureFile(TQString::null); + Prefs::setCurrentLectureFile(TQString()); m_defaultLectureAction->setCurrentItem(-1); } else { @@ -177,12 +177,12 @@ void KTouch::keyPressEvent(TQKeyEvent *keyEvent) { m_trainer->continueTraining(); } if (keyEvent->text().length() > 1) { - kdDebug() << "[KTouch::keyPressEvent] text = '" << keyEvent->text() << "'" << endl; + kdDebug() << "[KTouch::keyPressEvent] text = '" << keyEvent->text().data() << "'" << endl; } - TQChar key = keyEvent->text().at(0); // get first unicode character + TQChar key = keyEvent->text().at(0); // get first tqunicode character // HACK : manually filter out known dead keys // bool has_dead_key = true; - switch (key.unicode()) { + switch (key.tqunicode()) { case 94 : m_lastDeadKey = TQChar(uint(94)); break; case 176 : m_lastDeadKey = TQChar(uint(176)); break; case 180 : m_lastDeadKey = TQChar(uint(180)); break; @@ -285,7 +285,7 @@ void KTouch::configCommonColorsToggled(bool on) { // The action File->Open lecture... void KTouch::fileOpenLecture() { trainingPause(); - KURL tmp = KFileDialog::getOpenURL(TQString::null, TQString::null, this, i18n("Select Training Lecture File") ); + KURL tmp = KFileDialog::getOpenURL(TQString(), TQString(), this, i18n("Select Training Lecture File") ); if (!tmp.isEmpty()) { // first store training statistics m_trainer->storeTrainingStatistics(); @@ -431,16 +431,16 @@ void KTouch::optionsPreferences() { dialog->addPage(m_pageKeyboard, i18n("Keyboard Settings"), "keyboard_layout"); m_pageColors = new KTouchPrefColorsLayout(0, "Colors"); dialog->addPage(m_pageColors, i18n("Color Settings"), "package_graphics"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(applyPreferences())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(applyPreferences())); // TODO : Connect some other buttons/check boxes of the dialog connect(m_pageGeneral->kcfg_OverrideLectureFont, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configOverrideLectureFontToggled(bool))); + TQT_TQOBJECT(this), TQT_SLOT(configOverrideLectureFontToggled(bool))); connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configOverrideKeyboardFontToggled(bool))); + TQT_TQOBJECT(this), TQT_SLOT(configOverrideKeyboardFontToggled(bool))); connect(m_pageTraining->kcfg_AutoLevelChange, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configAutoLevelChangeToggled(bool))); + TQT_TQOBJECT(this), TQT_SLOT(configAutoLevelChangeToggled(bool))); connect(m_pageColors->kcfg_CommonTypingLineColors, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(configCommonColorsToggled(bool))); + TQT_TQOBJECT(this), TQT_SLOT(configCommonColorsToggled(bool))); // call the functions to enable/disable controls depending on settings configOverrideLectureFontToggled(Prefs::overrideLectureFont()); configOverrideKeyboardFontToggled(Prefs::overrideKeyboardFont()); @@ -459,18 +459,18 @@ void KTouch::changeStatusbarStats(unsigned int level_correct, unsigned int level unsigned int session_correct, unsigned int session_total, unsigned int session_words) { statusBar()->changeItem(i18n( "Level: Correct/Total chars: %1/%2 Words: %3") - .arg(level_correct).arg(level_total).arg(level_words), 1); + .tqarg(level_correct).tqarg(level_total).tqarg(level_words), 1); statusBar()->changeItem(i18n( "Session: Correct/Total chars: %1/%2 Words: %3") - .arg(session_correct).arg(session_total).arg(session_words), 2); + .tqarg(session_correct).tqarg(session_total).tqarg(session_words), 2); } // ---------------------------------------------------------------------------- void KTouch::changeKeyboard(int num) { if (static_cast<unsigned int>(num)>=m_keyboardFiles.count()) return; Prefs::setCurrentKeyboardFile( m_keyboardFiles[num] ); -// kdDebug() << "[KTouch::changeKeyboard] new keyboard layout = " << Prefs::currentKeyboardFile() << endl; +// kdDebug() << "[KTouch::changeKeyboard] new keyboard tqlayout = " << Prefs::currentKeyboardFile() << endl; m_keyboardLayoutAction->setCurrentItem(num); - // call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen layout file is corrupt + // call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen tqlayout file is corrupt m_keyboardWidget->applyPreferences(this, false); } // ---------------------------------------------------------------------------- @@ -489,7 +489,7 @@ void KTouch::changeLecture(int num) { KTouchLecture l; TQString fileName = m_lectureFiles[num]; if (!l.loadXML(this, KURL::fromPathOrURL(fileName))) { - KMessageBox::sorry(0, i18n("Could not find/open the lecture file '%1'.").arg(fileName) ); + KMessageBox::sorry(0, i18n("Could not tqfind/open the lecture file '%1'.").tqarg(fileName) ); m_defaultLectureAction->setCurrentItem(-1); } else { @@ -608,11 +608,11 @@ void KTouch::init() { //kdDebug() << "[KTouch::init] populating file lists..." << endl; updateFileLists(); // create lists with default lecture/keyboard/examination files/colour scheme files //kdDebug() << "[KTouch::init] " << m_lectureFiles.count() << " lectures available" << endl; - //kdDebug() << "[KTouch::init] " << m_keyboardFiles.count() << " keyboard layouts available" << endl; + //kdDebug() << "[KTouch::init] " << m_keyboardFiles.count() << " keyboard tqlayouts available" << endl; //kdDebug() << "[KTouch::init] " << m_examinationFiles.count() << " examination files available" << endl; if (Prefs::currentLectureFile() == "default") { - Prefs::setCurrentLectureFile(TQString::null); + Prefs::setCurrentLectureFile(TQString()); // /// \todo look up a lecture in the language of the KDE locale /* TQString default_lecture = "default"; if (m_lectureFiles.count() > 0) default_lecture = m_lectureFiles[0]; @@ -620,21 +620,21 @@ void KTouch::init() { */ } - // if keyboard layout (loaded by Prefs is not available (e.g. the - // layout file has been deleted) switch to default keyboard - if (m_keyboardFiles.contains(Prefs::currentKeyboardFile() )==0) { + // if keyboard tqlayout (loaded by Prefs is not available (e.g. the + // tqlayout file has been deleted) switch to default keyboard + if (m_keyboardFiles.tqcontains(Prefs::currentKeyboardFile() )==0) { TQString default_keyboard; // determine locale TQString lang = KGlobal::locale()->language(); TQString fname = lang + ".keyboard"; // try to find keyboard with current locale TQStringList::const_iterator it = m_keyboardFiles.constBegin(); - while (it != m_keyboardFiles.constEnd() && (*it).find(fname) == -1) ++it; + while (it != m_keyboardFiles.constEnd() && (*it).tqfind(fname) == -1) ++it; if (it == m_keyboardFiles.constEnd()) { fname = lang.left(2) + ".keyboard"; // try to find more general version it = m_keyboardFiles.constBegin(); - while (it != m_keyboardFiles.constEnd() && (*it).find(fname) == -1) ++it; + while (it != m_keyboardFiles.constEnd() && (*it).tqfind(fname) == -1) ++it; } if (it != m_keyboardFiles.constEnd()) @@ -652,18 +652,18 @@ void KTouch::init() { } // ---------------------------------------------------------------------------- -// Creates the layout and GUI setup for a practice session +// Creates the tqlayout and GUI setup for a practice session void KTouch::initTrainingSession() { - //kdDebug() << "[KTouch::initTrainingSession] setting up layouts and widgets for new training session..." << endl; + //kdDebug() << "[KTouch::initTrainingSession] setting up tqlayouts and widgets for new training session..." << endl; // Build the training area. The status widget has a fixed vertical size, the slide line and the // keyboard grow according to their vertical stretch factors (see last argument in the constructors // of TQSizePolicy) TQVBox * mainLayout = new TQVBox( this ); - m_statusWidget = new KTouchStatus( mainLayout ); + m_statusWidget = new KTouchtqStatus( mainLayout ); m_slideLineWidget = new KTouchSlideLine( mainLayout ); - m_slideLineWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 1) ); + m_slideLineWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 1) ); m_keyboardWidget = new KTouchKeyboardWidget( mainLayout ); - m_keyboardWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 3) ); + m_keyboardWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 3) ); setCentralWidget(mainLayout); // apply the settings to the widgets m_slideLineWidget->applyPreferences(); @@ -684,40 +684,40 @@ void KTouch::initTrainingSession() { void KTouch::setupActions() { // *** File menu *** new KAction(i18n("&Open lecture..."), "open_lecture", 0, - this, TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); + TQT_TQOBJECT(this), TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); new KAction(i18n("&Edit lecture..."), "edit_lecture", 0, - this, TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); + TQT_TQOBJECT(this), TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); new KAction(i18n("&Edit color scheme..."), "edit_colors", 0, - this, TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); + TQT_TQOBJECT(this), TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); // new KAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0, -// this, TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); - KStdAction::quit(this, TQT_SLOT(fileQuit()), actionCollection()); +// TQT_TQOBJECT(this), TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(fileQuit()), actionCollection()); // *** Training menu *** new KAction(i18n("&Start New Session"), "launch", 0, - this, TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); + TQT_TQOBJECT(this), TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); m_trainingPause = new KAction(i18n("&Pause Session"), "player_pause", 0, - this, TQT_SLOT(trainingPause()), actionCollection(), "training_pause"); + TQT_TQOBJECT(this), TQT_SLOT(trainingPause()), actionCollection(), "training_pause"); new KAction(i18n("&Lecture Statistics"), "kalarm", 0, - this, TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats"); + TQT_TQOBJECT(this), TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats"); // Setup menu entries for the training lectures - m_defaultLectureAction = new KSelectAction(i18n("Default &Lectures"), 0, this, 0, actionCollection(), "default_lectures"); + m_defaultLectureAction = new KSelectAction(i18n("Default &Lectures"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "default_lectures"); m_defaultLectureAction->setMenuAccelsEnabled(false); m_defaultLectureAction->setItems(m_lectureTitles); m_defaultLectureAction->setCurrentItem(0); - connect (m_defaultLectureAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeLecture(int))); + connect (m_defaultLectureAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeLecture(int))); // *** Settings menu *** - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); - // Setup menu entries for keyboard layouts - m_keyboardLayoutAction= new KSelectAction(i18n("&Keyboard Layouts"), 0, this, 0, actionCollection(), "keyboard_layouts"); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + // Setup menu entries for keyboard tqlayouts + m_keyboardLayoutAction= new KSelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts"); m_keyboardLayoutAction->setMenuAccelsEnabled(false); m_keyboardLayoutAction->setItems(m_keyboardTitles); - connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeKeyboard(int))); + connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeKeyboard(int))); // Setup menu entries for colour schemes - m_keyboardColorAction = new KSelectAction(i18n("&Color Schemes"), 0, this, 0, actionCollection(), "keyboard_schemes"); + m_keyboardColorAction = new KSelectAction(i18n("&Color Schemes"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_schemes"); TQStringList schemes_list; for (unsigned int i=0; i<KTouchColorScheme::m_colorSchemes.count(); ++i) schemes_list.append(KTouchColorScheme::m_colorSchemes[i].m_name); @@ -726,7 +726,7 @@ void KTouch::setupActions() { if (static_cast<unsigned int>(Prefs::currentColorScheme()) >= schemes_list.count()) Prefs::setCurrentColorScheme(1); m_keyboardColorAction->setCurrentItem(Prefs::currentColorScheme()); - connect (m_keyboardColorAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeColor(int))); + connect (m_keyboardColorAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeColor(int))); } // ---------------------------------------------------------------------------- @@ -753,9 +753,9 @@ void KTouch::updateFileLists() { // TODO : search in i18n() directories m_keyboardFiles = dirs->findAllResources("data","ktouch/*.keyboard"); - // remove the number layout, since this is the necessary default layout and will be + // remove the number tqlayout, since this is the necessary default tqlayout and will be // added anyway - TQStringList::iterator it = m_keyboardFiles.find("number.keyboard"); + TQStringList::iterator it = m_keyboardFiles.tqfind("number.keyboard"); if (it!=m_keyboardFiles.end()) m_keyboardFiles.remove(it); m_keyboardTitles.clear(); @@ -826,7 +826,7 @@ void KTouch::updateLectureActionCheck() { int num = 0; TQStringList::iterator it = m_lectureFiles.begin(); TQString fname = Prefs::currentLectureFile(); - while (it != m_lectureFiles.end() && (*it).find(fname) == -1) { + while (it != m_lectureFiles.end() && (*it).tqfind(fname) == -1) { ++it; ++num; } @@ -839,7 +839,7 @@ void KTouch::updateKeyboardActionCheck() { int num = 0; TQStringList::iterator it = m_keyboardFiles.begin(); TQString fname = Prefs::currentKeyboardFile(); - while (it != m_keyboardFiles.end() && (*it).find(fname) == -1) { + while (it != m_keyboardFiles.end() && (*it).tqfind(fname) == -1) { ++it; ++num; } @@ -866,7 +866,7 @@ void KTouch::imEndEvent(TQIMEvent *e) { if (!e->text().isEmpty()) { if (e->text() == "^") { TQKeyEvent *ev = new TQKeyEvent (TQEvent::KeyPress, - Qt::Key_AsciiCircum, '^', 0, + TQt::Key_AsciiCircum, '^', 0, TQString("^")); keyPressEvent(ev); delete ev; diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h index ba5f8e56..4703fd92 100644 --- a/ktouch/src/ktouch.h +++ b/ktouch/src/ktouch.h @@ -30,7 +30,7 @@ class KToggleAction; class KActionMenu; class KSelectAction; -class KTouchStatus; +class KTouchtqStatus; class KTouchSlideLine; class KTouchKeyboardWidget; class KTouchTrainer; @@ -58,6 +58,7 @@ class KTouchPrefColorsLayout; /// object and all the widgets. class KTouch : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /// Constructor, creates the KTouch proggy. KTouch(); @@ -100,7 +101,7 @@ class KTouch : public KMainWindow { void trainingStatistics(); ///< The action Training->Show training statistics... void optionsPreferences(); ///< The action Settings->Configure KTouch... - /// Quick-changes the keyboard layout (called from menu). + /// Quick-changes the keyboard tqlayout (called from menu). void changeKeyboard(int num); /// Quick-changes the colour scheme used on the keyboard (called from menu). void changeColor(int num); @@ -110,7 +111,7 @@ class KTouch : public KMainWindow { protected: /// Reimplementated to save preferences and bool queryExit(); - /// Some layout fixes here... + /// Some tqlayout fixes here... void resizeEvent(TQResizeEvent *); /// Accepts a typed char. void keyPressEvent(TQKeyEvent *keyEvent); @@ -127,7 +128,7 @@ class KTouch : public KMainWindow { /// Initialises the program during a normal startup void init(); - /// Creates the layout and GUI setup for a practice session + /// Creates the tqlayout and GUI setup for a practice session void initTrainingSession(); /// Creates the (standard) actions and entries in the menu. void setupActions(); @@ -153,7 +154,7 @@ class KTouch : public KMainWindow { KSelectAction *m_keyboardColorAction; KSelectAction *m_defaultLectureAction; - KTouchStatus *m_statusWidget; ///< Pointer to the status widget on top of the main widget. + KTouchtqStatus *m_statusWidget; ///< Pointer to the status widget on top of the main widget. KTouchSlideLine *m_slideLineWidget; ///< Pointer to the sliding line widget. KTouchKeyboardWidget *m_keyboardWidget; ///< Pointer to the keyboard widget. KTouchTrainer *m_trainer; ///< The training 'master' (runs the training). @@ -170,12 +171,12 @@ class KTouch : public KMainWindow { TQStringList m_examinationFiles; ///< A list of all default examination files. TQStringList m_examinationTitles; ///< A list of the titles of all default examination files. - TQStringList m_keyboardFiles; ///< A list of all default keyboard layout files. - TQStringList m_keyboardTitles; ///< A list of the titles of all default keyboard layout files. + TQStringList m_keyboardFiles; ///< A list of all default keyboard tqlayout files. + TQStringList m_keyboardTitles; ///< A list of the titles of all default keyboard tqlayout files. KTouchStatisticsData m_stats; ///< All user statistics are kept here. - QChar m_lastDeadKey; ///< Temporary storage of last dead key. + TQChar m_lastDeadKey; ///< Temporary storage of last dead key. }; /// A global pointer to the main widget (actually only used to retrieve some data). diff --git a/ktouch/src/ktouchchartwidget.cpp b/ktouch/src/ktouchchartwidget.cpp index 43e3642a..5eec6633 100644 --- a/ktouch/src/ktouchchartwidget.cpp +++ b/ktouch/src/ktouchchartwidget.cpp @@ -20,8 +20,8 @@ #include <numeric> // for mathematical functions #include <cmath> -KTouchChartWidget::KTouchChartWidget(TQWidget* parent, const char *name) - : KPlotWidget(0.0, 1.0, 0.0, 1.0, parent, name) +KTouchChartWidget::KTouchChartWidget(TQWidget* tqparent, const char *name) + : KPlotWidget(0.0, 1.0, 0.0, 1.0, tqparent, name) { setShowGrid( false ); // no grid please setBGColor( TQColor( "white" ) ); diff --git a/ktouch/src/ktouchchartwidget.h b/ktouch/src/ktouchchartwidget.h index 799a5a38..00193e5a 100644 --- a/ktouch/src/ktouchchartwidget.h +++ b/ktouch/src/ktouchchartwidget.h @@ -24,9 +24,10 @@ class KTouchTrainer; /// This is the chart widget and contains all chart drawing code. class KTouchChartWidget : public KPlotWidget { Q_OBJECT + TQ_OBJECT public: /// Constructor. - KTouchChartWidget(TQWidget* parent, const char *name=0); + KTouchChartWidget(TQWidget* tqparent, const char *name=0); /// Destructor. ~KTouchChartWidget(); }; diff --git a/ktouch/src/ktouchcoloreditor.cpp b/ktouch/src/ktouchcoloreditor.cpp index e9bdb829..b1f3e3a4 100644 --- a/ktouch/src/ktouchcoloreditor.cpp +++ b/ktouch/src/ktouchcoloreditor.cpp @@ -23,8 +23,8 @@ #include <klocale.h> #include <kmessagebox.h> -KTouchColorEditor::KTouchColorEditor(TQWidget* parent, const char* name, bool modal, WFlags fl) -: KTouchColorEditorDlg(parent,name, modal,fl) +KTouchColorEditor::KTouchColorEditor(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: KTouchColorEditorDlg(tqparent,name, modal,fl) { } // ---------------------------------------------------------------------------- @@ -36,7 +36,7 @@ KTouchColorEditor::~KTouchColorEditor() void KTouchColorEditor::startEditor(TQValueList<KTouchColorScheme>& schemes, int active, int & selected) { m_schemes = schemes; - m_currentItem = QMAX(0, active); + m_currentItem = TQMAX(0, active); updateListBox(); if (active >= 0) m_currentItem = active; @@ -107,7 +107,7 @@ void KTouchColorEditor::updateClicked() { (*it).m_background[7] = back8Btn->color(); updateListBox(); - schemeListBox->setCurrentItem( QMIN(old_num, static_cast<int>(m_schemes.count())-1) ); + schemeListBox->setCurrentItem( TQMIN(old_num, static_cast<int>(m_schemes.count())-1) ); colorSchemeChanged(NULL); } // ---------------------------------------------------------------------------- @@ -121,7 +121,7 @@ void KTouchColorEditor::removeBtnClicked() { m_schemes.erase(it); } updateListBox(); - schemeListBox->setCurrentItem( QMIN(old_num, static_cast<int>(m_schemes.count())-1) ); + schemeListBox->setCurrentItem( TQMIN(old_num, static_cast<int>(m_schemes.count())-1) ); colorSchemeChanged(NULL); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchcoloreditor.h b/ktouch/src/ktouchcoloreditor.h index 9e826e94..ce532d6a 100644 --- a/ktouch/src/ktouchcoloreditor.h +++ b/ktouch/src/ktouchcoloreditor.h @@ -27,10 +27,11 @@ class KTouchColorEditor : public KTouchColorEditorDlg { Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchColorEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchColorEditor(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); /// Destructor ~KTouchColorEditor(); diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui index d6c4a0a7..8422b41e 100644 --- a/ktouch/src/ktouchcoloreditor_dlg.ui +++ b/ktouch/src/ktouchcoloreditor_dlg.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KTouchColorEditorDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KTouchColorEditorDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -31,7 +31,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQListBox" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>schemeListBox</cstring> </property> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -108,7 +108,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>editGroupBox</cstring> </property> @@ -127,15 +127,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>nameL</cstring> </property> @@ -158,7 +158,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -177,9 +177,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <grid> <property name="name"> @@ -193,7 +193,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -226,7 +226,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -246,22 +246,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3_5</cstring> </property> @@ -269,7 +269,7 @@ <string>Student text on error</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_4</cstring> </property> @@ -293,7 +293,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3_3</cstring> </property> @@ -317,7 +317,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3_6</cstring> </property> @@ -337,7 +337,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -346,7 +346,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>keyboardColorsGroup</cstring> </property> @@ -365,9 +365,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <grid> <property name="name"> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -400,7 +400,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -417,22 +417,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel3_9</cstring> </property> @@ -440,7 +440,7 @@ <string>Highlighted text color</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3_8</cstring> </property> @@ -456,7 +456,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3_7</cstring> </property> @@ -464,7 +464,7 @@ <string>Key frame</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -496,7 +496,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel3_10</cstring> </property> @@ -514,7 +514,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -523,15 +523,15 @@ </spacer> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_7_2</cstring> </property> @@ -547,7 +547,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3_9_2</cstring> </property> @@ -563,7 +563,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel3_10_2</cstring> </property> @@ -587,7 +587,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -595,7 +595,7 @@ <string>Modifier/other keys:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3_8_2</cstring> </property> @@ -607,7 +607,7 @@ </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_11</cstring> </property> @@ -615,9 +615,9 @@ <string>Background colors for normal keys:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout28</cstring> + <cstring>tqlayout28</cstring> </property> <hbox> <property name="name"> @@ -774,9 +774,9 @@ </connection> <connection> <sender>schemeListBox</sender> - <signal>currentChanged(QListBoxItem*)</signal> + <signal>currentChanged(TQListBoxItem*)</signal> <receiver>KTouchColorEditorDlg</receiver> - <slot>colorSchemeChanged(QListBoxItem*)</slot> + <slot>colorSchemeChanged(TQListBoxItem*)</slot> </connection> <connection> <sender>updateBtn</sender> @@ -785,14 +785,14 @@ <slot>updateClicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>closeQuery()</slot> <slot>addBtnClicked()</slot> <slot>removeBtnClicked()</slot> <slot>updateClicked()</slot> - <slot>colorSchemeChanged(QListBoxItem * item)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot>colorSchemeChanged(TQListBoxItem * item)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp index 9a20d2e9..3e36f458 100644 --- a/ktouch/src/ktouchcolorscheme.cpp +++ b/ktouch/src/ktouchcolorscheme.cpp @@ -36,21 +36,21 @@ void KTouchColorScheme::clear() { m_teacherBackground = TQColor("#BEBEFF"); m_studentTextColor = TQColor("#003200"); m_studentBackground = TQColor("#9FFF9F"); - m_errorTextColor = Qt::white; + m_errorTextColor = TQt::white; m_errorBackground = TQColor("#AC0000"); - m_frame = Qt::black; + m_frame = TQt::black; m_background[0] = TQColor(255,238, 7); m_background[4] = TQColor(247,138,247); m_background[1] = TQColor( 14,164,239); m_background[5] = TQColor(158,255,155); m_background[2] = TQColor(158,255,155); m_background[6] = TQColor( 14,164,239); m_background[3] = TQColor(252,138,138); m_background[7] = TQColor(255,238, 7); - m_text = Qt::black; - m_backgroundH = Qt::darkBlue; - m_textH = Qt::white; - m_cBackground = Qt::gray; - m_cText = Qt::black; - m_cBackgroundH = Qt::white; - m_cTextH = Qt::black; + m_text = TQt::black; + m_backgroundH = TQt::darkBlue; + m_textH = TQt::white; + m_cBackground = TQt::gray; + m_cText = TQt::black; + m_cBackgroundH = TQt::white; + m_cTextH = TQt::black; m_default = false; } @@ -81,7 +81,7 @@ bool KTouchColorScheme::read(const TQDomNode& node) { TQDomNode c; READ_COLOR("KeyFrame", m_frame); for (unsigned int i=0; i<8; ++i) { - READ_COLOR(TQString("KeyBack_%1").arg(i), m_background[i]); + READ_COLOR(TQString("KeyBack_%1").tqarg(i), m_background[i]); } READ_COLOR("KeyText", m_text); READ_COLOR("KeyBackHigh", m_backgroundH); @@ -125,7 +125,7 @@ void KTouchColorScheme::write(TQDomDocument& doc, TQDomElement& root) const { WRITE_COLOR(key_colors, "KeyFrame", m_frame); for (unsigned int i=0; i<8; ++i) { - WRITE_COLOR(key_colors, TQString("KeyBack_%1").arg(i), m_background[i]); + WRITE_COLOR(key_colors, TQString("KeyBack_%1").tqarg(i), m_background[i]); } WRITE_COLOR(key_colors, "KeyText", m_text); WRITE_COLOR(key_colors, "KeyBackHigh", m_backgroundH); @@ -224,22 +224,22 @@ void KTouchColorScheme::createDefaults() { color.m_default = true; color.m_name = i18n("Black & White"); - color.m_teacherTextColor = Qt::black; - color.m_teacherBackground = Qt::white; - color.m_studentTextColor = Qt::black; - color.m_studentBackground = Qt::white; - color.m_errorTextColor = Qt::white; - color.m_errorBackground = Qt::black; - color.m_frame = Qt::black; + color.m_teacherTextColor = TQt::black; + color.m_teacherBackground = TQt::white; + color.m_studentTextColor = TQt::black; + color.m_studentBackground = TQt::white; + color.m_errorTextColor = TQt::white; + color.m_errorBackground = TQt::black; + color.m_frame = TQt::black; for (int i=0; i<8; ++i) - color.m_background[i] = Qt::white; - color.m_text = Qt::black; - color.m_backgroundH = Qt::black; - color.m_textH = Qt::white; - color.m_cBackground = Qt::gray; - color.m_cText = Qt::black; - color.m_cBackgroundH = Qt::white; - color.m_cTextH = Qt::black; + color.m_background[i] = TQt::white; + color.m_text = TQt::black; + color.m_backgroundH = TQt::black; + color.m_textH = TQt::white; + color.m_cBackground = TQt::gray; + color.m_cText = TQt::black; + color.m_cBackgroundH = TQt::white; + color.m_cTextH = TQt::black; m_colorSchemes.push_back(color); color.m_name = i18n("Classic"); @@ -247,26 +247,26 @@ void KTouchColorScheme::createDefaults() { color.m_teacherBackground = TQColor("#BEBEFF"); color.m_studentTextColor = TQColor("#003200"); color.m_studentBackground = TQColor("#9FFF9F"); - color.m_errorTextColor = Qt::white; + color.m_errorTextColor = TQt::white; color.m_errorBackground = TQColor("#AC0000"); - color.m_frame = Qt::black; + color.m_frame = TQt::black; color.m_background[0] = TQColor(255,238, 7); color.m_background[4] = TQColor(247,138,247); color.m_background[1] = TQColor( 14,164,239); color.m_background[5] = TQColor(158,255,155); color.m_background[2] = TQColor(158,255,155); color.m_background[6] = TQColor( 14,164,239); color.m_background[3] = TQColor(252,138,138); color.m_background[7] = TQColor(255,238, 7); - color.m_text = Qt::black; - color.m_backgroundH = Qt::darkBlue; - color.m_textH = Qt::white; - color.m_cBackground = Qt::gray; - color.m_cText = Qt::black; - color.m_cBackgroundH = Qt::white; - color.m_cTextH = Qt::black; + color.m_text = TQt::black; + color.m_backgroundH = TQt::darkBlue; + color.m_textH = TQt::white; + color.m_cBackground = TQt::gray; + color.m_cText = TQt::black; + color.m_cBackgroundH = TQt::white; + color.m_cTextH = TQt::black; m_colorSchemes.push_back(color); color.m_name = i18n("Deep Blue"); - color.m_teacherTextColor = Qt::white; + color.m_teacherTextColor = TQt::white; color.m_teacherBackground = TQColor( 0, 39, 80); - color.m_studentTextColor = Qt::white; + color.m_studentTextColor = TQt::white; color.m_studentBackground = TQColor( 39, 59,127); color.m_errorTextColor = TQColor("#B5CFFF"); color.m_errorBackground = TQColor("#640000"); @@ -275,34 +275,34 @@ void KTouchColorScheme::createDefaults() { color.m_background[1] = TQColor( 39, 59,127); color.m_background[5] = TQColor( 8, 44,124); color.m_background[2] = TQColor( 4, 39, 53); color.m_background[6] = TQColor( 10, 82,158); color.m_background[3] = TQColor( 40, 32,121); color.m_background[7] = TQColor( 43, 60,124); - color.m_text = Qt::white; + color.m_text = TQt::white; color.m_backgroundH = TQColor(125,180,255); - color.m_textH = Qt::darkBlue; - color.m_cBackground = Qt::black; - color.m_cText = Qt::white; + color.m_textH = TQt::darkBlue; + color.m_cBackground = TQt::black; + color.m_cText = TQt::white; color.m_cBackgroundH = TQColor(111,121,73); - color.m_cTextH = Qt::white; + color.m_cTextH = TQt::white; m_colorSchemes.push_back(color); color.m_name = i18n("Stripy"); - color.m_teacherTextColor = Qt::white; + color.m_teacherTextColor = TQt::white; color.m_teacherBackground = TQColor( 39, 70, 227); - color.m_studentTextColor = Qt::white; + color.m_studentTextColor = TQt::white; color.m_studentBackground = TQColor( 39, 70, 127); - color.m_errorTextColor = Qt::white; - color.m_errorBackground = Qt::darkGray; - color.m_frame = Qt::black; + color.m_errorTextColor = TQt::white; + color.m_errorBackground = TQt::darkGray; + color.m_frame = TQt::black; for (int i=0; i<8; i=i+2) color.m_background[i] = TQColor( 39, 70, 127); for (int i=1; i<8; i=i+2) - color.m_background[i] = Qt::darkGray; - color.m_text = Qt::black; + color.m_background[i] = TQt::darkGray; + color.m_text = TQt::black; color.m_backgroundH = TQColor( 39, 70, 227); - color.m_textH = Qt::white; - color.m_cBackground = Qt::gray; - color.m_cText = Qt::black; + color.m_textH = TQt::white; + color.m_cBackground = TQt::gray; + color.m_cText = TQt::black; color.m_cBackgroundH = TQColor( 39, 70, 227); - color.m_cTextH = Qt::black; + color.m_cTextH = TQt::black; m_colorSchemes.push_back(color); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchdefaults.h b/ktouch/src/ktouchdefaults.h index d66a1663..8f6631db 100644 --- a/ktouch/src/ktouchdefaults.h +++ b/ktouch/src/ktouchdefaults.h @@ -21,7 +21,7 @@ extern const unsigned int BEGINNER_SPEED; ///< Speed for rating in characters p extern const unsigned int ADVANCED_SPEED; ///< Speed for rating in characters per minute. extern const unsigned int PROFESSIONAL_SPEED; ///< Speed for rating in characters per minute. -extern const int KEYBOARD_MARGIN; ///< The margin around the keybaord layout. +extern const int KEYBOARD_MARGIN; ///< The margin around the keybaord tqlayout. extern const int LCD_UPDATE_INTERVAL; ///< Update interval for LCD display and statistics. diff --git a/ktouch/src/ktouchkey.h b/ktouch/src/ktouchkey.h index 011f4e4b..cfa179c5 100644 --- a/ktouch/src/ktouchkey.h +++ b/ktouch/src/ktouchkey.h @@ -41,7 +41,7 @@ class KTouchKeyChar { position_t m_pos; ///< The position of the character. bool m_bold; ///< Whether this is a bold character. - QString m_text; ///< The text to draw of m_ch == 0. + TQString m_text; ///< The text to draw of m_ch == 0. }; /// This class represents a key on the keyboard. diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp index 1e7440a5..f4ecf178 100644 --- a/ktouch/src/ktouchkeyboard.cpp +++ b/ktouch/src/ktouchkeyboard.cpp @@ -27,14 +27,14 @@ void KTouchKeyboard::clear() { m_keys.clear(); m_connectors.clear(); - m_title = TQString::null; - m_comment = TQString::null; - m_language = TQString::null; - m_fontSuggestions = TQString::null; + m_title = TQString(); + m_comment = TQString(); + m_language = TQString(); + m_fontSuggestions = TQString(); } // ---------------------------------------------------------------------------- -// Loads a keyboard layout (old format) from file (returns true if successful). +// Loads a keyboard tqlayout (old format) from file (returns true if successful). bool KTouchKeyboard::load(TQWidget * window, const KURL& url) { // Ok, first download the contents as usual using the KIO lib // File is only downloaded if not local, otherwise it's just opened @@ -163,7 +163,7 @@ bool KTouchKeyboard::read(TQTextStream& in) { m_connectors.push_back(keycon); } else { - //errorMsg = i18n("Missing key type in line '%1'.").arg(line); + //errorMsg = i18n("Missing key type in line '%1'.").tqarg(line); return false; } // calculate the maximum extent of the keyboard on the fly... @@ -176,14 +176,14 @@ bool KTouchKeyboard::read(TQTextStream& in) { // Loads keyboard data from file into an XML document bool KTouchKeyboard::read(const TQDomDocument& doc) { // clean current data - kdDebug() << "Reading new keyboard layout" << endl; + kdDebug() << "Reading new keyboard tqlayout" << endl; m_keys.clear(); m_connectors.clear(); - m_title = TQString::null; + m_title = TQString(); // retrieve the title TQDomNodeList entries = doc.elementsByTagName("Title"); if (entries.count() >= 1) m_title = entries.item(0).firstChild().nodeValue(); - else m_title = i18n("untitled keyboard layout"); + else m_title = i18n("untitled keyboard tqlayout"); kdDebug() << "Title: " << m_title << endl; // retrieve the comment entries = doc.elementsByTagName("Comment"); @@ -235,7 +235,7 @@ void KTouchKeyboard::write(TQDomDocument& doc) const { // Store title and ensure that the file contains a title! TQDomElement title = doc.createElement("Title"); TQDomText titleText; - if (m_title.isEmpty()) titleText = doc.createTextNode( i18n("untitled keyboard layout") ); + if (m_title.isEmpty()) titleText = doc.createTextNode( i18n("untitled keyboard tqlayout") ); else titleText = doc.createTextNode(m_title); title.appendChild(titleText); root.appendChild(title); @@ -281,7 +281,7 @@ void KTouchKeyboard::createDefault() { const int keyWidth = 20; const int col = keyWidth+keySpacing; const int row = keyHeight+keySpacing; - // First let's create the visible layout. + // First let's create the visible tqlayout. // This means we have to create all keys that will be displayed. // Note: purely decorative keys get a key character code of 0! m_keys.clear(); @@ -327,8 +327,8 @@ void KTouchKeyboard::createDefault() { m_connectors.push_back( KTouchKeyConnector('.', '.', '6', 0) ); m_title = "Number keypad"; - m_comment = "Predefined keyboard layout"; - m_language = TQString::null; + m_comment = "Predefined keyboard tqlayout"; + m_language = TQString(); // language does not apply to numbers... that's one of the nice things with math :-) m_fontSuggestions = "Monospace"; m_width = 8*col; @@ -352,12 +352,12 @@ bool KTouchKeyboard::loadKeyboard(TQWidget * window, const KURL& url, TQString* bool result = readKeyboard(target, msg); KIO::NetAccess::removeTempFile(target); if (!result && errorMsg!=NULL) - *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg; + *errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").tqarg(url.url()) + msg; return result; } else { if (errorMsg!=NULL) - *errorMsg = i18n("Could not download/open keyboard layout file from '%1'.").arg(url.url()); + *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").tqarg(url.url()); return false; } } @@ -382,7 +382,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) { TQTextStream out( &outfile ); out << "########################################## \n"; out << "# # \n"; - out << "# Keyboard layout file for KTouch # \n"; + out << "# Keyboard tqlayout file for KTouch # \n"; out << "# # \n"; out << "########################################## \n"; out << "#\n"; @@ -396,7 +396,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) { default : out << "NormalKey "; break; } TQRect rect=key->frame(); - out << key->m_keyChar.unicode() << '\t' << key->m_keyText << '\t' + out << key->m_keyChar.tqunicode() << '\t' << key->m_keyText << '\t' << rect.left() << '\t' << rect.top() << '\t' << rect.width() << '\t' << rect.height() << endl; } @@ -408,15 +408,15 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) { } void KTouchKeyboard::applyPreferences(TQWidget * window, bool silent) { - // let's check whether the keyboard layout has changed + // let's check whether the keyboard tqlayout has changed if (KTouchConfig().m_currentKeyboardFile!=m_currentLayout) { - // if the layout is the number layout just create it and we're done + // if the tqlayout is the number tqlayout just create it and we're done if (KTouchConfig().m_currentKeyboardFile=="number.keyboard") { createDefaultKeyboard(); resizeEvent(NULL); return; } - // ok, let's load this layout + // ok, let's load this tqlayout if (silent) { // during initialisation we don't want to have a message box, that's why this is silent if (!loadKeyboard(window, KURL::fromPathOrURL( KTouchConfig().m_currentKeyboardFile ))) @@ -427,8 +427,8 @@ void KTouchKeyboard::applyPreferences(TQWidget * window, bool silent) { else { TQString errorMsg; if (!loadKeyboard(window, KURL::fromPathOrURL( KTouchConfig().m_currentKeyboardFile ), &errorMsg)) { - KMessageBox::error( 0, i18n("Error reading the keyboard layout; the default number keypad will " - "be created instead. You can choose another keyboard layout in the preferences dialog."), + KMessageBox::error( 0, i18n("Error reading the keyboard tqlayout; the default number keypad will " + "be created instead. You can choose another keyboard tqlayout in the preferences dialog."), errorMsg); createDefaultKeyboard(); } @@ -607,7 +607,7 @@ bool KTouchKeyboard::readKeyboard(const TQString& fileName, TQString& errorMsg) m_connectorList.append( KTouchKeyConnector(keyAscII, targetChar, fingerChar, controlChar) ); } else { - errorMsg = i18n("Missing key type in line '%1'.").arg(line); + errorMsg = i18n("Missing key type in line '%1'.").tqarg(line); return false; } // calculate the maximum extent of the keyboard on the fly... diff --git a/ktouch/src/ktouchkeyboard.h b/ktouch/src/ktouchkeyboard.h index 5334c49b..0e2ebfd6 100644 --- a/ktouch/src/ktouchkeyboard.h +++ b/ktouch/src/ktouchkeyboard.h @@ -24,7 +24,7 @@ class KURL; -/// This class stores the keyboard layout and the connectivity between characters +/// This class stores the keyboard tqlayout and the connectivity between characters /// and the actual keys. class KTouchKeyboard { public: @@ -32,7 +32,7 @@ class KTouchKeyboard { KTouchKeyboard() { createDefault(); } /// Clears the keyboard (resets all data) void clear(); - /// Loads a keyboard layout (old format) from file (returns true if successful). + /// Loads a keyboard tqlayout (old format) from file (returns true if successful). bool load(TQWidget * window, const KURL& url); /// Loads a lecture (in XML format) from file (returns true if successful). bool loadXML(TQWidget * window, const KURL& url); @@ -46,10 +46,10 @@ class KTouchKeyboard { TQValueVector<KTouchKey> m_keys; ///< Vector with key definitions. TQValueVector<KTouchKeyConnector> m_connectors; ///< Vector with connectivity data. - QString m_title; ///< Title of the keyboard (to appear in the menu). - QString m_comment; ///< Comments about the creator of the keyboard layout. - QString m_language; ///< Language ID of keyboard - QString m_fontSuggestions; ///< Suggestions of fonts to be used on the keys. + TQString m_title; ///< Title of the keyboard (to appear in the menu). + TQString m_comment; ///< Comments about the creator of the keyboard tqlayout. + TQString m_language; ///< Language ID of keyboard + TQString m_fontSuggestions; ///< Suggestions of fonts to be used on the keys. // These variables are recalculated after the keyboard was loaded. int m_width; ///< The width of the keyboard (maximum of the sums of all keywidths in each line). diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp index 54f026bb..17c87997 100644 --- a/ktouch/src/ktouchkeyboardeditor.cpp +++ b/ktouch/src/ktouchkeyboardeditor.cpp @@ -34,8 +34,8 @@ // ***** Public functions *** // ************************** -KTouchKeyboardEditor::KTouchKeyboardEditor(TQWidget* parent, const char* name, bool modal, WFlags fl) - : KTouchKeyboardEditorDlg(parent,name, modal,fl) +KTouchKeyboardEditor::KTouchKeyboardEditor(TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : KTouchKeyboardEditorDlg(tqparent,name, modal,fl) { } // ----------------------------------------------------------------------------- @@ -66,7 +66,7 @@ void KTouchKeyboardEditor::fontBtnClicked() { titleEdit->setFont(f); keyboardCommentEdit->setFont(f); languageEdit->setFont(f); - update(); // trigger repaint of the keyboard. + update(); // trigger tqrepaint of the keyboard. setModified(); } } @@ -89,7 +89,7 @@ void KTouchKeyboardEditor::saveBtnClicked() { // ----------------------------------------------------------------------------- void KTouchKeyboardEditor::saveAsBtnClicked() { - TQString tmp = KFileDialog::getSaveFileName(TQString::null, + TQString tmp = KFileDialog::getSaveFileName(TQString(), i18n("*.keyboard.xml|KTouch Keyboard Files (*.keyboard.xml)\n*.*|All Files"), this, i18n("Save Keyboard Layout") ); if (!tmp.isEmpty()) { transfer_from_dialog(); @@ -133,7 +133,7 @@ void KTouchKeyboardEditor::paintEvent(TQPaintEvent *) { void KTouchKeyboardEditor::transfer_to_dialog() { if (m_currentURL.isEmpty()) { - titleEdit->setText( i18n("untitled keyboard layout") ); + titleEdit->setText( i18n("untitled keyboard tqlayout") ); keyboardCommentEdit->setText(""); } else { @@ -167,13 +167,13 @@ void KTouchKeyboardEditor::transfer_to_dialog() { min_y = std::min<unsigned int>(min_y, it->m_y); max_y = std::max<unsigned int>(max_y, it->m_y+it->m_h); } - dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").arg(max_x - min_x).arg(max_y - min_y) ); + dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").tqarg(max_x - min_x).tqarg(max_y - min_y) ); } // ----------------------------------------------------------------------------- void KTouchKeyboardEditor::transfer_from_dialog() { m_keyboard.m_title = titleEdit->text(); - if (m_keyboard.m_title.isEmpty()) m_keyboard.m_title = i18n("untitled keyboard layout"); + if (m_keyboard.m_title.isEmpty()) m_keyboard.m_title = i18n("untitled keyboard tqlayout"); m_keyboard.m_comment = keyboardCommentEdit->text(); m_keyboard.m_language = languageEdit->text(); } @@ -201,7 +201,7 @@ int KTouchKeyboardEditor::openKeyboardFile(const KURL& url) { !m_keyboard.load(this, m_currentURL) && !m_keyboard.loadXML(this, m_currentURL)) { KMessageBox::sorry(this, i18n("Could not open the keyboard file, creating a new one instead!")); - m_currentURL = TQString::null; // new keyboards haven't got a URL + m_currentURL = TQString(); // new keyboards haven't got a URL m_keyboard.clear(); } // If we have no URL, we create a new keyboard - can happen if either the user @@ -234,7 +234,7 @@ bool KTouchKeyboardEditor::saveModified() { if (!m_modified) return true; // ok, ask the user to save the changes int result = KMessageBox::questionYesNoCancel(this, - i18n("The keyboard has been changed. Do you want to save the changes?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard()); + i18n("The keyboard has been changed. Do you want to save the changes?"),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()); if (result == KMessageBox::Cancel) return false; // User aborted if (result == KMessageBox::Yes) saveBtnClicked(); // if successfully saved the modified flag will be resetted in the saveBtnClicked() function diff --git a/ktouch/src/ktouchkeyboardeditor.h b/ktouch/src/ktouchkeyboardeditor.h index 48c6e4f6..8b36da95 100644 --- a/ktouch/src/ktouchkeyboardeditor.h +++ b/ktouch/src/ktouchkeyboardeditor.h @@ -41,10 +41,11 @@ /// @see startEditor() for details on the return value. class KTouchKeyboardEditor : public KTouchKeyboardEditorDlg { Q_OBJECT + TQ_OBJECT public: /// Constructor. - KTouchKeyboardEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchKeyboardEditor(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); /// Default destructor. ~KTouchKeyboardEditor() {} /// Shows and executes the dialog (argument is the url to the default or diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui index f6aa1009..e27c6575 100644 --- a/ktouch/src/ktouchkeyboardeditor_dlg.ui +++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KTouchKeyboardEditorDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KTouchKeyboardEditorDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,9 +19,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -89,7 +89,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -108,7 +108,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>dimensionsLabel</cstring> </property> @@ -116,7 +116,7 @@ <string>Keyboard dimensions:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>keyboardPreviewLabel</cstring> </property> @@ -128,7 +128,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>100</height> @@ -143,7 +143,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -154,7 +154,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>keyListBox</cstring> </property> @@ -167,9 +167,9 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -225,7 +225,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -233,7 +233,7 @@ <string>Key definition data:</string> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>keyInfoText</cstring> </property> @@ -248,7 +248,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -259,7 +259,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>titleLabel</cstring> </property> @@ -290,14 +290,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>70</height> </size> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -305,7 +305,7 @@ <string>Comments:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -378,7 +378,7 @@ <slot>keySelectionChanged(QListBoxItem*)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>openBtnClicked()</slot> <slot>saveBtnClicked()</slot> <slot>saveAsBtnClicked()</slot> @@ -388,8 +388,8 @@ <slot>editBtnClicked()</slot> <slot>removeBtnClicked()</slot> <slot>keySelectionChanged(QListBoxItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index 99cc63cc..bbf42687 100644 --- a/ktouch/src/ktouchkeyboardwidget.cpp +++ b/ktouch/src/ktouchkeyboardwidget.cpp @@ -35,8 +35,8 @@ TQMap<TQChar, int> KTouchKeyboardWidget::m_keyCharMap; // -------------------------------------------------------------------------- -KTouchKeyboardWidget::KTouchKeyboardWidget(TQWidget *parent) - : TQWidget(parent), m_keyboardWidth(100), m_keyboardHeight(60), m_currentLayout(""), +KTouchKeyboardWidget::KTouchKeyboardWidget(TQWidget *tqparent) + : TQWidget(tqparent), m_keyboardWidth(100), m_keyboardHeight(60), m_currentLayout(""), m_hideKeyboard(false) { setMinimumHeight(100); // when it's smaller you won't see anything @@ -51,12 +51,12 @@ bool KTouchKeyboardWidget::loadKeyboard(TQWidget * window, const KURL& url, TQSt bool result = readKeyboard(target, msg); KIO::NetAccess::removeTempFile(target); if (!result && errorMsg!=NULL) - *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg; + *errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").tqarg(url.url()) + msg; return result; } else { if (errorMsg!=NULL) - *errorMsg = i18n("Could not download/open keyboard layout file from '%1'.").arg(url.url()); + *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").tqarg(url.url()); return false; } } @@ -81,7 +81,7 @@ void KTouchKeyboardWidget::saveKeyboard(TQWidget * window, const KURL& url) { TQTextStream out( &outfile ); out << "########################################## \n"; out << "# # \n"; - out << "# Keyboard layout file for KTouch # \n"; + out << "# Keyboard tqlayout file for KTouch # \n"; out << "# # \n"; out << "########################################## \n"; out << "#\n"; @@ -95,7 +95,7 @@ void KTouchKeyboardWidget::saveKeyboard(TQWidget * window, const KURL& url) { default : out << "NormalKey "; break; } TQRect rect=key->frame(); - out << key->m_keyChar.unicode() << '\t' << key->m_keyText << '\t' + out << key->m_keyChar.tqunicode() << '\t' << key->m_keyText << '\t' << rect.left() << '\t' << rect.top() << '\t' << rect.width() << '\t' << rect.height() << endl; } @@ -112,16 +112,16 @@ void KTouchKeyboardWidget::applyPreferences(TQWidget * window, bool silent) { setMaximumHeight(100); else setMaximumHeight(10000); - // let's check whether the keyboard layout has changed + // let's check whether the keyboard tqlayout has changed if (Prefs::currentKeyboardFile() != m_currentLayout) { - // if the layout is the number layout just create it and we're done + // if the tqlayout is the number tqlayout just create it and we're done //kdDebug() << "[KTouchKeyboardWidget::applyPreferences] keyboard = " << Prefs::currentKeyboardFile() << endl; if (Prefs::currentKeyboardFile()=="number.keyboard") { createDefaultKeyboard(); resizeEvent(NULL); return; } - // ok, let's load this layout + // ok, let's load this tqlayout if (silent) { // during initialisation we don't want to have a message box, that's why this is silent if (!loadKeyboard(window, KURL::fromPathOrURL( Prefs::currentKeyboardFile() ))) @@ -132,8 +132,8 @@ void KTouchKeyboardWidget::applyPreferences(TQWidget * window, bool silent) { else { TQString errorMsg; if (!loadKeyboard(window, KURL::fromPathOrURL( Prefs::currentKeyboardFile() ), &errorMsg)) { - KMessageBox::error( 0, i18n("Error reading the keyboard layout; the default number keypad will " - "be created instead. You can choose another keyboard layout in the preferences dialog."), + KMessageBox::error( 0, i18n("Error reading the keyboard tqlayout; the default number keypad will " + "be created instead. You can choose another keyboard tqlayout in the preferences dialog."), errorMsg); createDefaultKeyboard(); } @@ -309,7 +309,7 @@ void KTouchKeyboardWidget::createDefaultKeyboard() { updateColours(); m_currentLayout="number.keyboard"; - // create keyboard geometry for new keyboard data + // create keyboard tqgeometry for new keyboard data int sp = 10; int h = 50; @@ -397,13 +397,13 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro w=h=8; // default values for old keyboard files m_keyList.append( new KTouchFingerKey(keyAscII, keyText, x+1, y+1, w, h) ); m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, 0, 0) ); -// kdDebug() << "read : F : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; +// kdDebug() << "read : F : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; } else if (keyType=="ControlKey") { lineStream >> keyText >> x >> y >> w >> h; m_keyList.append( new KTouchControlKey(keyAscII, keyText, x+1, y+1, w-2, h-2) ); m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, 0, 0) ); -// kdDebug() << "read : C : unicode = " << keyAscII << " char = " << keyText << endl; +// kdDebug() << "read : C : tqunicode = " << keyAscII << " char = " << keyText << endl; } else if (keyType=="NormalKey") { int fingerCharCode; @@ -412,16 +412,16 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro // retrieve the finger key with the matching char m_keyList.append( new KTouchNormalKey(keyAscII, keyText, x+1, y+1, w, h) ); m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, fingerCharCode, 0) ); -// kdDebug() << "read : N : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; +// kdDebug() << "read : N : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; } else if (keyType=="HiddenKey") { int targetChar, fingerChar, controlChar; lineStream >> targetChar >> fingerChar >> controlChar; m_connectorList.append( KTouchKeyConnection(keyAscII, targetChar, fingerChar, controlChar) ); -// kdDebug() << "read : H : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl; +// kdDebug() << "read : H : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl; } else { - errorMsg = i18n("Missing key type in line '%1'.").arg(line); + errorMsg = i18n("Missing key type in line '%1'.").tqarg(line); return false; } if (keys.find(keyAscII)!=keys.end()) { @@ -437,7 +437,7 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro m_keyboardWidth = std::max(m_keyboardWidth, x+w); m_keyboardHeight = std::max(m_keyboardHeight, y+h); } while (!in.atEnd() && !line.isNull()); -// kdDebug() << "showing all unicode numbers in this file" << endl; +// kdDebug() << "showing all tqunicode numbers in this file" << endl; /* for (std::set<TQChar>::iterator it = keys.begin(); it != keys.end(); ++it) kdDebug() << *it << endl; */ @@ -460,9 +460,9 @@ void KTouchKeyboardWidget::updateColours() { TQChar targetChar = (*it).m_targetKeyChar; // this is the _base_ character of the key that needs to be highlighted TQChar ch = (*it).m_keyChar; -/* kdDebug() << "Key #"<<++counter<<": " << ch << "(" << ch.unicode() << ") " - << "target = " << targetChar << "(" << targetChar.unicode() << ") " - << "finger = " << fingerChar << "(" << fingerChar.unicode() << ")" << endl; +/* kdDebug() << "Key #"<<++counter<<": " << ch << "(" << ch.tqunicode() << ") " + << "target = " << targetChar << "(" << targetChar.tqunicode() << ") " + << "finger = " << fingerChar << "(" << fingerChar.tqunicode() << ")" << endl; */ m_keyCharMap[ch] = -1; diff --git a/ktouch/src/ktouchkeyboardwidget.h b/ktouch/src/ktouchkeyboardwidget.h index 047a7575..a31497ad 100644 --- a/ktouch/src/ktouchkeyboardwidget.h +++ b/ktouch/src/ktouchkeyboardwidget.h @@ -30,28 +30,29 @@ class KURL; /** This is the keyboard widget at the bottom of the training screen. * In addition to the painting functions this class has the member * functions loadKeyboard() and saveKeyboard() which can read and write - * a keyboard layout from/into a file.<p> + * a keyboard tqlayout from/into a file.<p> * The keyboard is drawn in the paintEvent() member function. The * resizing, that means the recalculation of m_shift is * done in the resizeEvent() member function.<p> * The state of keyboard and keys does not change while it is - * repainted or resized. Only when a new character has been typed + * tqrepainted or resized. Only when a new character has been typed * and the newKey() slot is called the state changes (and thus the * activated keys and finger key animations etc.) */ class KTouchKeyboardWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchKeyboardWidget(TQWidget *parent); - /// Reads a keyboard layout from the given URL. + KTouchKeyboardWidget(TQWidget *tqparent); + /// Reads a keyboard tqlayout from the given URL. /// The function returns 'true' when the reading was successful or 'false' if not. In this /// case the optional parameter errorMsg contains the error message. bool loadKeyboard(TQWidget * window, const KURL& url, TQString* errorMsg=NULL); - /// Saves the keyboard layout to the URL. + /// Saves the keyboard tqlayout to the URL. void saveKeyboard(TQWidget * window, const KURL& url); - /// Applies preferences to the keyboard layout and the keys. - /// This means that the layout is basically recreated and if the layout type/language + /// Applies preferences to the keyboard tqlayout and the keys. + /// This means that the tqlayout is basically recreated and if the tqlayout type/language /// changed it will be reloaded. void applyPreferences(TQWidget * window, bool silent); @@ -89,7 +90,7 @@ class KTouchKeyboardWidget : public TQWidget { int m_keyboardWidth; ///< The width of the keyboard (maximum of the sums of all keywidths in each line). int m_keyboardHeight; ///< The height of the keyboard (sum of all key row heights). double m_shift; ///< The horizontal shift for the keyboard. - TQString m_currentLayout; ///< The name of the currently used layout. + TQString m_currentLayout; ///< The name of the currently used tqlayout. TQChar m_nextKey; ///< The next to be pressed character. bool m_hideKeyboard; ///< If true, the keyboard won't be shown. diff --git a/ktouch/src/ktouchkeys.cpp b/ktouch/src/ktouchkeys.cpp index 83efa572..6f45d40a 100644 --- a/ktouch/src/ktouchkeys.cpp +++ b/ktouch/src/ktouchkeys.cpp @@ -68,7 +68,7 @@ void KTouchNormalKey::paint(TQPainter& p) const { p.setPen( colorScheme.m_frame ); textColor = colorScheme.m_text; }; - KTouchBaseKey::paint(p); // call the parents paint() function + KTouchBaseKey::paint(p); // call the tqparents paint() function p.setPen(textColor); p.setFont( m_font ); diff --git a/ktouch/src/ktouchkeys.h b/ktouch/src/ktouchkeys.h index 68ffa959..c429790d 100644 --- a/ktouch/src/ktouchkeys.h +++ b/ktouch/src/ktouchkeys.h @@ -39,7 +39,7 @@ class KTouchBaseKey { m_x(x), m_y(y), m_w(w), m_h(h), m_type(NORMAL_KEY) {} /// Destructor. virtual ~KTouchBaseKey() {} - /// Paints the basic key shape using the painter p. + /// Paints the basic key tqshape using the painter p. virtual void paint(TQPainter& p) const; /// Recalculates the scaled position and size properties of the key. void resize(double scale); @@ -66,7 +66,7 @@ class KTouchBaseKey { int m_wS; ///< The scaled width of the key. int m_hS; ///< The scaled height of the key. - KeyType m_type; ///< Stores the type of the key (convenience for saving of the keyboard layout). + KeyType m_type; ///< Stores the type of the key (convenience for saving of the keyboard tqlayout). }; // --------------------------------------------------------------------------------------- @@ -116,14 +116,14 @@ class KTouchFingerKey : public KTouchNormalKey { /** This is a special or control key. * This key acts as a modifier key to a normal key (for instance a shift key) and has a - * different shape and painting routine then the normal keys. Therefore it is directly + * different tqshape and painting routine then the normal keys. Therefore it is directly * derived from KTouchKey. */ class KTouchControlKey : public KTouchBaseKey { public: /// Constructor KTouchControlKey(const TQChar& keyChar, const TQString& keyText, int x, int y, int w, int h); - /// Extends the parents paint routine (draws the text or other fancy stuff). + /// Extends the tqparents paint routine (draws the text or other fancy stuff). void paint(TQPainter& p) const; }; // ------------------------------------------------------------------------------------ diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp index 5f5d57de..1f3b687b 100644 --- a/ktouch/src/ktouchlecture.cpp +++ b/ktouch/src/ktouchlecture.cpp @@ -122,16 +122,16 @@ bool KTouchLecture::readLecture(TQTextStream& in) { m_lectureData.clear(); // now loop until end of file is reached and break down the textfile into several strings containing the levels TQStringList slist; - TQString current_level = TQString::null; // used to store the current level data + TQString current_level = TQString(); // used to store the current level data line = in.readLine(); bool in_level = false; while (!in.atEnd() && !line.isNull()) { // only consider non-empty lines if (!line.isEmpty()) { // lecture title? - if (line.find("# Title:") == 0) + if (line.tqfind("# Title:") == 0) m_title = line.right(line.length() - 8).stripWhiteSpace(); - else if (line[0]!='#' || line.find("# Comment:")!=-1) { + else if (line[0]!='#' || line.tqfind("# Comment:")!=-1) { // ok, after all those comment lines, we finally found the beginn of a level in_level = true; current_level += line + '\n'; @@ -139,7 +139,7 @@ bool KTouchLecture::readLecture(TQTextStream& in) { else if (in_level) { // ok, a new comment found, if we were reading a level, store it slist.append(current_level); - current_level = TQString::null; + current_level = TQString(); in_level = false; } } diff --git a/ktouch/src/ktouchlecture.h b/ktouch/src/ktouchlecture.h index 9cc4cc6e..7c2af0d8 100644 --- a/ktouch/src/ktouchlecture.h +++ b/ktouch/src/ktouchlecture.h @@ -27,7 +27,7 @@ class KURL; /// This class handles the lecture data and provides the lines to type. /// /// It contains the level data (see KTouchLevelData). A lecture object -/// contains <b>ALWAYS</b> at least one lecture.<p> +/// tqcontains <b>ALWAYS</b> at least one lecture.<p> /// The lecture data can be read and written using the member functions /// readLecture() and writeLecture().<p> /// During a training session the program will occasionally need a new diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index e274732b..12a497f9 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -41,8 +41,8 @@ // ***** Public functions *** // ************************** -KTouchLectureEditor::KTouchLectureEditor(TQWidget *parent, const char* name, bool modal, WFlags fl) - : KTouchLectureEditorDlg(parent, name, modal, fl) +KTouchLectureEditor::KTouchLectureEditor(TQWidget *tqparent, const char* name, bool modal, WFlags fl) + : KTouchLectureEditorDlg(tqparent, name, modal, fl) { levelListView->setSorting(-1); // don't sort my level list view! @@ -111,7 +111,7 @@ void KTouchLectureEditor::saveBtnClicked() { // ----------------------------------------------------------------------------- void KTouchLectureEditor::saveAsBtnClicked() { - TQString tmp = KFileDialog::getSaveFileName(TQString::null, + TQString tmp = KFileDialog::getSaveFileName(TQString(), "*.ktouch.xml|KTouch Lecture Files(*.ktouch.xml)\n*.*|All Files", this, i18n("Save Training Lecture") ); if (!tmp.isEmpty()) { transfer_from_dialog(); @@ -307,7 +307,7 @@ void KTouchLectureEditor::transfer_from_dialog() { void KTouchLectureEditor::showCurrentLevel() { if (m_level >= m_lecture.m_lectureData.size()) return; // should not happen, but why running a risk here... - levelLabel->setText(i18n("Data of Level %1").arg(m_level+1) ); + levelLabel->setText(i18n("Data of Level %1").tqarg(m_level+1) ); levelCommentEdit->setText(m_lecture.m_lectureData[m_level].m_comment); newCharsEdit->setText(m_lecture.m_lectureData[m_level].m_newChars); TQString text; @@ -379,7 +379,7 @@ int KTouchLectureEditor::openLectureFile(const KURL& url) { // try to read old format first then XML format if (!m_lecture.load(this, m_currentURL) && !m_lecture.loadXML(this, m_currentURL)) { KMessageBox::sorry(this, i18n("Could not open the lecture file, creating a new one instead.")); - m_currentURL = TQString::null; // new lectures haven't got a URL + m_currentURL = TQString(); // new lectures haven't got a URL } } // If we have no URL, we create a new lecture - can happen if either the user @@ -411,7 +411,7 @@ bool KTouchLectureEditor::saveModified() { if (!m_modified) return true; // ok, ask the user to save the changes int result = KMessageBox::questionYesNoCancel(this, - i18n("The lecture has been changed. Do you want to save the changes?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard()); + i18n("The lecture has been changed. Do you want to save the changes?"),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()); if (result == KMessageBox::Cancel) return false; // User aborted if (result == KMessageBox::Yes) saveBtnClicked(); // if successfully saved the modified flag will be resetted in the saveBtnClicked() function diff --git a/ktouch/src/ktouchlectureeditor.h b/ktouch/src/ktouchlectureeditor.h index 46d944b2..d09b7a9f 100644 --- a/ktouch/src/ktouchlectureeditor.h +++ b/ktouch/src/ktouchlectureeditor.h @@ -41,9 +41,10 @@ /// @see startEditor() for details on the return value. class KTouchLectureEditor : public KTouchLectureEditorDlg { Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchLectureEditor(TQWidget *parent, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KTouchLectureEditor(TQWidget *tqparent, const char* name = 0, bool modal = FALSE, WFlags fl = 0); /// Destructor ~KTouchLectureEditor() {} /// Shows and executes the dialog (argument is the url to the default or diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui index a5008e97..4d52aa97 100644 --- a/ktouch/src/ktouchlectureeditor_dlg.ui +++ b/ktouch/src/ktouchlectureeditor_dlg.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KTouchLectureEditorDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KTouchLectureEditorDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -30,15 +30,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>titleLabel</cstring> </property> @@ -59,7 +59,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -75,7 +75,7 @@ <string>Comment:</string> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>lectureCommentEdit</cstring> </property> @@ -87,7 +87,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>70</height> @@ -96,7 +96,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -107,9 +107,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -142,9 +142,9 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -153,9 +153,9 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -165,13 +165,13 @@ <property name="name"> <cstring>upBtn</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -188,13 +188,13 @@ <property name="name"> <cstring>downBtn</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -211,13 +211,13 @@ <property name="name"> <cstring>newBtn</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -242,13 +242,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -284,9 +284,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -297,7 +297,7 @@ <cstring>newCharsEdit</cstring> </property> </widget> - <widget class="QFrame" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQFrame" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>frame3</cstring> </property> @@ -316,7 +316,7 @@ <enum>Sunken</enum> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>commentLabel</cstring> </property> @@ -332,15 +332,15 @@ <string>Level comment (optional):</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>wordCountLabel</cstring> </property> @@ -358,14 +358,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>charCountLabel</cstring> </property> @@ -383,14 +383,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -400,7 +400,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>levelLabel</cstring> </property> @@ -422,7 +422,7 @@ <string>Level Data of Level 10</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -459,7 +459,7 @@ <enum>NoWrap</enum> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -484,9 +484,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout35</cstring> + <cstring>tqlayout35</cstring> </property> <hbox> <property name="name"> @@ -510,7 +510,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>248</width> <height>20</height> @@ -656,15 +656,15 @@ <tabstop>saveAsButton</tabstop> <tabstop>quitButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>openBtnClicked()</slot> <slot>saveBtnClicked()</slot> <slot>saveAsBtnClicked()</slot> <slot>closeQuery()</slot> <slot>setModified()</slot> <slot>fontBtnClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klistview.h</includehint> diff --git a/ktouch/src/ktouchleveldata.cpp b/ktouch/src/ktouchleveldata.cpp index d0606442..58ac983f 100644 --- a/ktouch/src/ktouchleveldata.cpp +++ b/ktouch/src/ktouchleveldata.cpp @@ -38,14 +38,14 @@ void KTouchLevelData::createDefault() { bool KTouchLevelData::readLevel(TQTextStream& in) { TQString line; - m_comment = m_newChars = TQString::null; + m_comment = m_newChars = TQString(); m_lines.clear(); // now read all the lines of the level, until EOF or an empty line line = in.readLine(); while (!line.isNull()) { if (!line.isEmpty()) { // Do we have a comment here? And if yes, is a keyword in the line? - if (line.find("# Comment:")==0) + if (line.tqfind("# Comment:")==0) m_comment = line.right(line.length() - 10).stripWhiteSpace(); else if (line[0]!='#') { // the first line is the new characters line diff --git a/ktouch/src/ktouchopenrequest.cpp b/ktouch/src/ktouchopenrequest.cpp index eb82f3f8..1a293f23 100644 --- a/ktouch/src/ktouchopenrequest.cpp +++ b/ktouch/src/ktouchopenrequest.cpp @@ -26,8 +26,8 @@ #include "ktouchopenrequest.h" #include "ktouchopenrequest.moc" -KTouchOpenRequest::KTouchOpenRequest(TQWidget* parent, const char* name, bool modal, WFlags fl) -: KTouchOpenRequestDlg(parent,name, modal,fl) +KTouchOpenRequest::KTouchOpenRequest(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: KTouchOpenRequestDlg(tqparent,name, modal,fl) { } @@ -79,7 +79,7 @@ void KTouchOpenRequest::okBtnClicked() { if (presetRadioBtn->isChecked()) m_url = presetCombo->currentText(); if (newRadioBtn->isChecked()) - m_url = TQString::null; + m_url = TQString(); if (openFileRadioBtn->isChecked()) { if (openFileEdit->text().isEmpty()) { KMessageBox::error(this, i18n("Please select or enter a file name.")); @@ -113,7 +113,7 @@ void KTouchOpenRequest::radioBtnChanged() { void KTouchOpenRequest::browseBtnClicked() { - KURL tmp = KFileDialog::getOpenURL(TQString::null, TQString::null, this, i18n("Select Training Lecture File") ); + KURL tmp = KFileDialog::getOpenURL(TQString(), TQString(), this, i18n("Select Training Lecture File") ); if (!tmp.isEmpty()) openFileEdit->setText(tmp.url()); } diff --git a/ktouch/src/ktouchopenrequest.h b/ktouch/src/ktouchopenrequest.h index 8f1c31d0..c66f9f02 100644 --- a/ktouch/src/ktouchopenrequest.h +++ b/ktouch/src/ktouchopenrequest.h @@ -52,17 +52,18 @@ /// class KTouchOpenRequest : public KTouchOpenRequestDlg { Q_OBJECT + TQ_OBJECT public: /// Default constructor. - KTouchOpenRequest(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchOpenRequest(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); /// Default destructor. ~KTouchOpenRequest() {} /// Sets up the dialog and runs it. /// @return Returns the dialogs return code, TQDialog::Accepted or TQDialog::Rejected. int requestFileToOpen(KURL& url, const TQString& caption, const TQString& title, const TQString& currentText, const TQString& defaultText, const TQString& openText, const TQString& newText, - KURL current_url = TQString::null, TQStringList defaultList = TQStringList(), TQString emptyListText = TQString::null); + KURL current_url = TQString(), TQStringList defaultList = TQStringList(), TQString emptyListText = TQString()); /// After the dialog has been accepted the URL chosen by the user is stored herein. KURL m_url; diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui index 38ff057e..c89eacf9 100644 --- a/ktouch/src/ktouchopenrequest_dlg.ui +++ b/ktouch/src/ktouchopenrequest_dlg.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KTouchOpenRequestDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KTouchOpenRequestDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>openChoiceGroup</cstring> </property> @@ -38,11 +38,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>currentRadioBtn</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>28</height> @@ -52,11 +52,11 @@ <string>Current something</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>presetRadioBtn</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>28</height> @@ -66,12 +66,12 @@ <string>Preset something:</string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>presetCombo</cstring> </property> </widget> - <widget class="QRadioButton" row="4" column="0"> + <widget class="TQRadioButton" row="4" column="0"> <property name="name"> <cstring>newRadioBtn</cstring> </property> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -106,16 +106,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -147,11 +147,11 @@ <string>Current something file</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>openFileRadioBtn</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>28</height> @@ -163,9 +163,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -181,7 +181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -273,12 +273,12 @@ <tabstop>okBtn</tabstop> <tabstop>cancelBtn</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>okBtnClicked()</slot> <slot>radioBtnChanged()</slot> <slot>browseBtnClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui index 5b475da0..5d5ccca3 100644 --- a/ktouch/src/ktouchprefcolorslayout.ui +++ b/ktouch/src/ktouchprefcolorslayout.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KTouchPrefColorsLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KTouchPrefColorsLayout</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -33,15 +33,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -59,14 +59,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Black & White</string> @@ -99,7 +99,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_CommonTypingLineColors</cstring> </property> @@ -107,7 +107,7 @@ <string>Use common typing line colors independent of color scheme</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>colorsGroup</cstring> </property> @@ -118,9 +118,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -130,7 +130,7 @@ <property name="name"> <cstring>kcfg_TeacherBackgroundColor</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>40</width> <height>0</height> @@ -146,7 +146,7 @@ <string>You can change here the background color for the teacher's line (the line of letters you have to type.)</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -166,7 +166,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>40</width> <height>0</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -217,7 +217,7 @@ <property name="name"> <cstring>kcfg_StudentTextColor</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>40</width> <height>0</height> @@ -233,7 +233,7 @@ <string>Here you can change the color of the text you type in the student line.</string> </property> </widget> - <widget class="QLabel" row="0" column="6"> + <widget class="TQLabel" row="0" column="6"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -245,7 +245,7 @@ <property name="name"> <cstring>kcfg_StudentBackgroundColor</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>40</width> <height>0</height> @@ -255,7 +255,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>textLabel1_4_2</cstring> </property> @@ -273,14 +273,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -288,7 +288,7 @@ <string>Text:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -306,14 +306,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>34</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="6"> + <widget class="TQLabel" row="1" column="6"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -333,14 +333,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ColorOnError</cstring> </property> @@ -351,9 +351,9 @@ <string>If checked this shows your error using the colors below on the typing line</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -369,14 +369,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>errorTextLabel</cstring> </property> @@ -391,7 +391,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>40</width> <height>0</height> @@ -424,14 +424,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>errorBackgroundLabel</cstring> </property> @@ -446,7 +446,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>40</width> <height>0</height> @@ -485,7 +485,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -504,7 +504,7 @@ <tabstop>kcfg_ErrorBackgroundColor</tabstop> <tabstop>kcfg_CurrentColorScheme</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui index b62a5e81..002ae628 100644 --- a/ktouch/src/ktouchprefgenerallayout.ui +++ b/ktouch/src/ktouchprefgenerallayout.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KTouchPrefGeneralLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KTouchPrefGeneralLayout</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_BeepOnError</cstring> </property> @@ -53,7 +53,7 @@ <string>If checked (default) this will emit a beep each time you make a typing error.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_SoundOnLevel</cstring> </property> @@ -69,7 +69,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -80,15 +80,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -106,18 +106,18 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>227</width> <height>20</height> </size> </property> </spacer> - <widget class="QSlider" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQSlider" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_SlidingSpeed</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>20</height> @@ -149,14 +149,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -164,7 +164,7 @@ <string>Slow: 1</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -184,22 +184,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -207,7 +207,7 @@ <string>Maximum height of sliding line widget:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_MaxSlidingWidgetHeight</cstring> </property> @@ -218,7 +218,7 @@ <number>50</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -238,22 +238,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>fontTextLabel</cstring> </property> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>114</width> <height>20</height> @@ -295,7 +295,7 @@ <string>This button will display a font dialog where you can change the font for the student and the teacher lines. When you leave the font dialog, the new font is previewed in the line below and only applied when you click the Apply button below.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_OverrideLectureFont</cstring> </property> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>30</height> @@ -334,7 +334,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontrequester.h</includehint> </includehints> diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui index 34851276..179f071d 100644 --- a/ktouch/src/ktouchprefkeyboardlayout.ui +++ b/ktouch/src/ktouchprefkeyboardlayout.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KTouchPrefKeyboardLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KTouchPrefKeyboardLayout</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowAnimation</cstring> </property> @@ -47,7 +47,7 @@ <string>This highlights on the keyboard the key you have to type next. It is easier to type when this is checked.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_HideKeyboard</cstring> </property> @@ -65,22 +65,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_OverrideKeyboardFont</cstring> </property> @@ -88,13 +88,13 @@ <string>Override keyboard fonts</string> </property> <property name="toolTip" stdset="0"> - <string>If checked you can specify your own keyboard font instead of the predefined one of the keyboard layout.</string> + <string>If checked you can specify your own keyboard font instead of the predefined one of the keyboard tqlayout.</string> </property> <property name="whatsThis" stdset="0"> - <string>Every keyboard layout may specify its own font. If the predefined font of a certain keyboard layout does not work or you would like to have your own, check this button. You may then choose your own font that will be used to draw the characters on the keys.</string> + <string>Every keyboard tqlayout may specify its own font. If the predefined font of a certain keyboard tqlayout does not work or you would like to have your own, check this button. You may then choose your own font that will be used to draw the characters on the keys.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -132,10 +132,10 @@ </widget> <customwidgets> </customwidgets> -<slots> +<Q_SLOTS> <slot>fontChooseBtnClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontrequester.h</includehint> </includehints> diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui index 19fe985c..e9b714e0 100644 --- a/ktouch/src/ktouchpreftraininglayout.ui +++ b/ktouch/src/ktouchpreftraininglayout.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KTouchPrefTrainingLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KTouchPrefTrainingLayout</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoLevelChange</cstring> </property> @@ -51,22 +51,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>l3</cstring> </property> @@ -82,7 +82,7 @@ <number>500</number> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>l2</cstring> </property> @@ -90,7 +90,7 @@ <string>Typing speed:</string> </property> </widget> - <widget class="QLabel" row="2" column="3"> + <widget class="TQLabel" row="2" column="3"> <property name="name"> <cstring>l5</cstring> </property> @@ -98,7 +98,7 @@ <string>%</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>l1</cstring> </property> @@ -121,14 +121,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>l4</cstring> </property> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -165,22 +165,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>l6</cstring> </property> @@ -188,7 +188,7 @@ <string>Limits to decrease a level</string> </property> </widget> - <widget class="QLabel" row="2" column="3"> + <widget class="TQLabel" row="2" column="3"> <property name="name"> <cstring>l10</cstring> </property> @@ -209,7 +209,7 @@ <number>500</number> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>l7</cstring> </property> @@ -217,7 +217,7 @@ <string>Typing speed:</string> </property> </widget> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>l9</cstring> </property> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -252,14 +252,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>l8</cstring> </property> @@ -269,7 +269,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DisableManualLevelChange</cstring> </property> @@ -279,7 +279,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -290,7 +290,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_RememberLevel</cstring> </property> @@ -310,7 +310,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -321,7 +321,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp index 3071cc52..b1870b7b 100644 --- a/ktouch/src/ktouchslideline.cpp +++ b/ktouch/src/ktouchslideline.cpp @@ -41,8 +41,8 @@ // --- don't touch the lines above --- -KTouchSlideLine::KTouchSlideLine(TQWidget *parent) - : TQWidget( parent ), +KTouchSlideLine::KTouchSlideLine(TQWidget *tqparent) + : TQWidget( tqparent ), m_teacherPixmap(NULL), m_studentPixmap(NULL), m_slideTimer(this), @@ -237,8 +237,8 @@ void KTouchSlideLine::resizeEvent ( TQResizeEvent * ) { KD_DEBUG( "[KTouchSlideLine::resizeEvent]" << endl ); // required input member variables: none - // when the widget is resized, the whole geometry is invalidated, so we do: - // 1. recalculate and store the geometry of the sliding lines + // when the widget is resized, the whole tqgeometry is tqinvalidated, so we do: + // 1. recalculate and store the tqgeometry of the sliding lines // 2. resize the font // 3. recreate the sliding lines (this is done from the resizeFont() function @@ -411,7 +411,7 @@ void KTouchSlideLine::updateSlidingLines() { // draw the teacher pixmap text TQPainter painter; - painter.begin (m_teacherPixmap, this); + painter.tqbegin (TQT_TQPAINTDEVICE(m_teacherPixmap), this); painter.setFont( m_font ); TQColor col_tt = Prefs::commonTypingLineColors() ? @@ -443,7 +443,7 @@ void KTouchSlideLine::updateSlidingLines() { KD_DEBUG( " m_studentPixmap = " << w+100 << " x " << h << endl ); // update (draw) student line and calculate coordinates needed for sliding - repaint(true); // trigger a paint event to erase the background + tqrepaint(true); // trigger a paint event to erase the background updateStudentLine(); } // ---------------------------------------------------------------------------- @@ -465,7 +465,7 @@ void KTouchSlideLine::updateStudentLine() { int teacherLen = m_teacherText.length(); int studentLen = m_studentText.length(); - unsigned int min_len = QMIN(teacherLen, studentLen); + unsigned int min_len = TQMIN(teacherLen, studentLen); TQString correctText; if (!Prefs::right2LeftTyping()) { @@ -532,7 +532,7 @@ void KTouchSlideLine::updateStudentLine() { // now let's draw the students pixmap TQPainter painter; - painter.begin (m_studentPixmap, this); + painter.tqbegin (TQT_TQPAINTDEVICE(m_studentPixmap), this); if (Prefs::colorOnError()) { // draw the student line depending on the colour settings if (error) { diff --git a/ktouch/src/ktouchslideline.h b/ktouch/src/ktouchslideline.h index b1466b7e..c707a9ad 100644 --- a/ktouch/src/ktouchslideline.h +++ b/ktouch/src/ktouchslideline.h @@ -33,9 +33,10 @@ class TQPainter; /// Please refer to the documentation 'sliding_line_widget.pdf' in the doc folder. class KTouchSlideLine : public TQWidget { Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchSlideLine(TQWidget *parent); + KTouchSlideLine(TQWidget *tqparent); /// Destructor, free memory allocated for the line pixmap. ~KTouchSlideLine(); /// Applies the preferences (font and colours). @@ -82,7 +83,7 @@ class KTouchSlideLine : public TQWidget { /// @see slide() void paintEvent( TQPaintEvent * ); /// Will be called when the widget is resized. - /// This event will first recalculate the geometry of the sliding lines. + /// This event will first recalculate the tqgeometry of the sliding lines. /// Then the font size will be updated and through that, the sliding lines will be /// updated. void resizeEvent ( TQResizeEvent * ); @@ -120,8 +121,8 @@ class KTouchSlideLine : public TQWidget { TQColor m_cursorBackground; ///< Defines the background colour of the cursor (when turned off). // variables depending on size of widget, will be updated in resizeEvent() - int m_marginVerWidget; ///< Vertical margin between widget boundary and sliding line in pixels. - int m_slideLineDist; ///< Vertical distance between sliding lines in pixels. + int m_marginVerWidget; ///<Qt::Vertical margin between widget boundary and sliding line in pixels. + int m_slideLineDist; ///<Qt::Vertical distance between sliding lines in pixels. int m_slideLineHeight; ///< Height of a sliding line in pixels. int m_marginCursor; ///< The margin for cursor movement (minimum distance from left and right ends of slide line boundaries). @@ -132,7 +133,7 @@ class KTouchSlideLine : public TQWidget { int m_yCursorStudent; ///< Cursor top y coordinate (from top of visible area) in the student line. // newly defined variables, will be updated on the setNewText() and partially in setStudentText() - int m_marginHorWidget; ///< Horizontal margin between widget boundary and sliding line in pixels. + int m_marginHorWidget; ///<Qt::Horizontal margin between widget boundary and sliding line in pixels. int m_slideLineWidth; ///< The length of the sliding line in pixels. int m_cursorRangeLen; ///< Length (in pixel) that the cursor can move between left and right margin. diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp index dbd807a6..6c73a91f 100644 --- a/ktouch/src/ktouchstatistics.cpp +++ b/ktouch/src/ktouchstatistics.cpp @@ -34,8 +34,8 @@ #include "ktouch.h" #include "ktouchchartwidget.h" -KTouchStatistics::KTouchStatistics(TQWidget* parent) - : KTouchStatisticsDlg(parent) +KTouchStatistics::KTouchStatistics(TQWidget* tqparent) + : KTouchStatisticsDlg(tqparent) { sessionsRadio->setChecked(true); WPMRadio->setChecked(true); @@ -122,7 +122,7 @@ void KTouchStatistics::lectureActivated(int index) { // ---------------------------------------------------------------------------- void KTouchStatistics::clearHistory() { - if (KMessageBox::warningContinueCancel(this, i18n("Erase all statistics data for the current user?"),TQString::null,KStdGuiItem::del()) + if (KMessageBox::warningContinueCancel(this, i18n("Erase all statistics data for the current user?"),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) { KTouchPtr->clearStatistics(); // clear statistics data in KTouch @@ -161,7 +161,7 @@ void KTouchStatistics::updateCurrentSessionTab() { else levelnums += ","; } levels_count = 0; - levelnums += TQString("%1").arg(*it+1); + levelnums += TQString("%1").tqarg(*it+1); } else { @@ -233,7 +233,7 @@ void KTouchStatistics::updateCurrentSessionTab() { void KTouchStatistics::updateCurrentLevelTab() { // level info - levelLabel2->setText( TQString("%1").arg(m_currLevelStats.m_levelNum+1) ); + levelLabel2->setText( TQString("%1").tqarg(m_currLevelStats.m_levelNum+1) ); // general stats group elapsedTimeLCDLevel->display(static_cast<int>(m_currLevelStats.m_elapsedTime)); totalCharsLCDLevel->display(static_cast<int>(m_currLevelStats.m_totalChars) ); @@ -328,7 +328,7 @@ void KTouchStatistics::updateChartTab() { { double t = m_currSessionStats.m_elapsedTime; double wpm = m_currSessionStats.m_words/t*60.0; - double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24); data.push_back(std::make_pair(tp, wpm) ); } chartWidget->LeftAxis.setLabel( i18n("Words per minute") ); @@ -352,7 +352,7 @@ void KTouchStatistics::updateChartTab() { { double t = m_currSessionStats.m_elapsedTime; double cpm = m_currSessionStats.m_correctChars/t*60.0; - double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24); data.push_back(std::make_pair(tp, cpm) ); } chartWidget->LeftAxis.setLabel( i18n("Characters per minute") ); @@ -376,7 +376,7 @@ void KTouchStatistics::updateChartTab() { { double tc = m_currSessionStats.m_totalChars; double corr = m_currSessionStats.m_correctChars/tc; - double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24); data.push_back(std::make_pair(tp, corr) ); } chartWidget->LeftAxis.setLabel( i18n("Correctness") ); @@ -407,7 +407,7 @@ void KTouchStatistics::updateChartTab() { double t = m_currSessionStats.m_elapsedTime; double cpm = m_currSessionStats.m_correctChars/t*60.0; double skill = corr*cpm; - double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24); data.push_back(std::make_pair(tp, skill) ); } chartWidget->LeftAxis.setLabel( i18n("Skill") ); @@ -455,11 +455,11 @@ void KTouchStatistics::updateChartTab() { void KTouchStatistics::updateChartTab() { if (m_trainer->m_sessionHistory.size()<2) { chartTypeButtonGroup->setEnabled(false); - chartWidget->setEraseColor( Qt::gray ); + chartWidget->setEraseColor( TQt::gray ); } else { chartTypeButtonGroup->setEnabled(true); - chartWidget->setEraseColor( Qt::white ); + chartWidget->setEraseColor( TQt::white ); }; if (charSpeedButton->isChecked()) chartWidget->setChartType( KTouchChartWidget::CharsPerMinute ); diff --git a/ktouch/src/ktouchstatistics.h b/ktouch/src/ktouchstatistics.h index 98983168..d621a462 100644 --- a/ktouch/src/ktouchstatistics.h +++ b/ktouch/src/ktouchstatistics.h @@ -27,9 +27,10 @@ class KURL; /// Implementation of the statistics widget class KTouchStatistics : public KTouchStatisticsDlg { Q_OBJECT + TQ_OBJECT public: /// Constructor, takes a pointer to the trainer object. - KTouchStatistics(TQWidget* parent); + KTouchStatistics(TQWidget* tqparent); /// Fills the statistics dialog with data and executes it. void run(const KURL& currentLecture, const KTouchStatisticsData& stats, diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui index 761fd908..6f8b4dc6 100644 --- a/ktouch/src/ktouchstatistics_dlg.ui +++ b/ktouch/src/ktouchstatistics_dlg.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KTouchStatisticsDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KTouchStatisticsDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>currentTab</cstring> </property> @@ -53,7 +53,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentTitleLabel</cstring> </property> @@ -67,15 +67,15 @@ <string>Current Training Session Statistics</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4_3_2</cstring> </property> @@ -83,7 +83,7 @@ <string>Levels in this session:</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>levelLabel1</cstring> </property> @@ -99,7 +99,7 @@ <string>levelLabel1</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_4_2</cstring> </property> @@ -107,7 +107,7 @@ <string>Lecture:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lectureLabel1</cstring> </property> @@ -125,15 +125,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout28</cstring> + <cstring>tqlayout28</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -144,7 +144,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -152,7 +152,7 @@ <string>Words typed:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -160,7 +160,7 @@ <string>Mistyped characters:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -168,11 +168,11 @@ <string>Time (seconds) elapsed:</string> </property> </widget> - <widget class="QLCDNumber" row="0" column="1"> + <widget class="TQLCDNumber" row="0" column="1"> <property name="name"> <cstring>elapsedTimeLCD</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -185,11 +185,11 @@ <string>This shows the number of seconds you have typed in this training session.</string> </property> </widget> - <widget class="QLCDNumber" row="1" column="1"> + <widget class="TQLCDNumber" row="1" column="1"> <property name="name"> <cstring>totalCharsLCD</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -202,11 +202,11 @@ <string>The number of characters (correct and wrong) that you have typed so far.</string> </property> </widget> - <widget class="QLCDNumber" row="2" column="1"> + <widget class="TQLCDNumber" row="2" column="1"> <property name="name"> <cstring>wrongCharsLCD</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -219,11 +219,11 @@ <string>Shows how many wrong characters you did type.</string> </property> </widget> - <widget class="QLCDNumber" row="3" column="1"> + <widget class="TQLCDNumber" row="3" column="1"> <property name="name"> <cstring>wordsLCD</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -236,7 +236,7 @@ <string>The number of words typed so far.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -246,7 +246,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -260,11 +260,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="0" column="2" rowspan="4" colspan="1"> + <widget class="TQFrame" row="0" column="2" rowspan="4" colspan="1"> <property name="name"> <cstring>frame4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>20</width> <height>0</height> @@ -277,17 +277,17 @@ <enum>Plain</enum> </property> </widget> - <widget class="QProgressBar" row="0" column="1"> + <widget class="TQProgressBar" row="0" column="1"> <property name="name"> <cstring>charProgress1</cstring> </property> </widget> - <widget class="QProgressBar" row="0" column="4"> + <widget class="TQProgressBar" row="0" column="4"> <property name="name"> <cstring>charProgress5</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>charLabel1</cstring> </property> @@ -295,7 +295,7 @@ <string>a:</string> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>charLabel5</cstring> </property> @@ -303,7 +303,7 @@ <string>e:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>charLabel2</cstring> </property> @@ -311,12 +311,12 @@ <string>b:</string> </property> </widget> - <widget class="QProgressBar" row="1" column="4"> + <widget class="TQProgressBar" row="1" column="4"> <property name="name"> <cstring>charProgress6</cstring> </property> </widget> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>charLabel6</cstring> </property> @@ -324,17 +324,17 @@ <string>f:</string> </property> </widget> - <widget class="QProgressBar" row="1" column="1"> + <widget class="TQProgressBar" row="1" column="1"> <property name="name"> <cstring>charProgress2</cstring> </property> </widget> - <widget class="QProgressBar" row="2" column="1"> + <widget class="TQProgressBar" row="2" column="1"> <property name="name"> <cstring>charProgress3</cstring> </property> </widget> - <widget class="QLabel" row="2" column="3"> + <widget class="TQLabel" row="2" column="3"> <property name="name"> <cstring>charLabel7</cstring> </property> @@ -342,7 +342,7 @@ <string>g:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>charLabel3</cstring> </property> @@ -350,22 +350,22 @@ <string>c:</string> </property> </widget> - <widget class="QProgressBar" row="2" column="4"> + <widget class="TQProgressBar" row="2" column="4"> <property name="name"> <cstring>charProgress7</cstring> </property> </widget> - <widget class="QProgressBar" row="3" column="4"> + <widget class="TQProgressBar" row="3" column="4"> <property name="name"> <cstring>charProgress8</cstring> </property> </widget> - <widget class="QProgressBar" row="3" column="1"> + <widget class="TQProgressBar" row="3" column="1"> <property name="name"> <cstring>charProgress4</cstring> </property> </widget> - <widget class="QLabel" row="3" column="3"> + <widget class="TQLabel" row="3" column="3"> <property name="name"> <cstring>charLabel8</cstring> </property> @@ -373,7 +373,7 @@ <string>h:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>charLabel4</cstring> </property> @@ -383,7 +383,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -394,7 +394,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -402,7 +402,7 @@ <string>Characters per minute:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel6_2</cstring> </property> @@ -410,11 +410,11 @@ <string>Words per minute:</string> </property> </widget> - <widget class="QLCDNumber" row="0" column="1"> + <widget class="TQLCDNumber" row="0" column="1"> <property name="name"> <cstring>charSpeedLCD</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -427,11 +427,11 @@ <string>The number of correct characters you typed per minute.</string> </property> </widget> - <widget class="QLCDNumber" row="1" column="1"> + <widget class="TQLCDNumber" row="1" column="1"> <property name="name"> <cstring>wordSpeedLCD</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -446,7 +446,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="1"> + <widget class="TQGroupBox" row="1" column="1"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -457,7 +457,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QProgressBar" row="0" column="0"> + <widget class="TQProgressBar" row="0" column="0"> <property name="name"> <cstring>correctnessBar</cstring> </property> @@ -479,7 +479,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -488,7 +488,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>currentLevelTab</cstring> </property> @@ -499,7 +499,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentTitleLabel_3</cstring> </property> @@ -513,15 +513,15 @@ <string>Current Level Statistics</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lectureLabel2</cstring> </property> @@ -537,7 +537,7 @@ <string>lectureLabel2</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4_3</cstring> </property> @@ -545,7 +545,7 @@ <string>Level:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_4</cstring> </property> @@ -553,7 +553,7 @@ <string>Lecture:</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>levelLabel2</cstring> </property> @@ -571,15 +571,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout28_2</cstring> + <cstring>tqlayout28_2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>groupBox4_2</cstring> </property> @@ -590,7 +590,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -598,7 +598,7 @@ <string>Words typed:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel5_2</cstring> </property> @@ -606,7 +606,7 @@ <string>Mistyped characters:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -614,11 +614,11 @@ <string>Time (seconds) elapsed:</string> </property> </widget> - <widget class="QLCDNumber" row="0" column="1"> + <widget class="TQLCDNumber" row="0" column="1"> <property name="name"> <cstring>elapsedTimeLCDLevel</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -628,11 +628,11 @@ <enum>Flat</enum> </property> </widget> - <widget class="QLCDNumber" row="1" column="1"> + <widget class="TQLCDNumber" row="1" column="1"> <property name="name"> <cstring>totalCharsLCDLevel</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -642,11 +642,11 @@ <enum>Flat</enum> </property> </widget> - <widget class="QLCDNumber" row="2" column="1"> + <widget class="TQLCDNumber" row="2" column="1"> <property name="name"> <cstring>wrongCharsLCDLevel</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -656,11 +656,11 @@ <enum>Flat</enum> </property> </widget> - <widget class="QLCDNumber" row="3" column="1"> + <widget class="TQLCDNumber" row="3" column="1"> <property name="name"> <cstring>wordsLCDLevel</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -670,7 +670,7 @@ <enum>Flat</enum> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_3</cstring> </property> @@ -680,7 +680,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox7_2</cstring> </property> @@ -694,11 +694,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="0" column="2" rowspan="4" colspan="1"> + <widget class="TQFrame" row="0" column="2" rowspan="4" colspan="1"> <property name="name"> <cstring>frame4_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>20</width> <height>0</height> @@ -711,17 +711,17 @@ <enum>Plain</enum> </property> </widget> - <widget class="QProgressBar" row="0" column="1"> + <widget class="TQProgressBar" row="0" column="1"> <property name="name"> <cstring>charProgress1Level</cstring> </property> </widget> - <widget class="QProgressBar" row="0" column="4"> + <widget class="TQProgressBar" row="0" column="4"> <property name="name"> <cstring>charProgress5Level</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>charLabel1Level</cstring> </property> @@ -729,7 +729,7 @@ <string>a:</string> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>charLabel5Level</cstring> </property> @@ -737,7 +737,7 @@ <string>e:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>charLabel2Level</cstring> </property> @@ -745,12 +745,12 @@ <string>b:</string> </property> </widget> - <widget class="QProgressBar" row="1" column="4"> + <widget class="TQProgressBar" row="1" column="4"> <property name="name"> <cstring>charProgress6Level</cstring> </property> </widget> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>charLabel6Level</cstring> </property> @@ -758,17 +758,17 @@ <string>f:</string> </property> </widget> - <widget class="QProgressBar" row="1" column="1"> + <widget class="TQProgressBar" row="1" column="1"> <property name="name"> <cstring>charProgress2Level</cstring> </property> </widget> - <widget class="QProgressBar" row="2" column="1"> + <widget class="TQProgressBar" row="2" column="1"> <property name="name"> <cstring>charProgress3Level</cstring> </property> </widget> - <widget class="QLabel" row="2" column="3"> + <widget class="TQLabel" row="2" column="3"> <property name="name"> <cstring>charLabel7Level</cstring> </property> @@ -776,7 +776,7 @@ <string>g:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>charLabel3Level</cstring> </property> @@ -784,22 +784,22 @@ <string>c:</string> </property> </widget> - <widget class="QProgressBar" row="2" column="4"> + <widget class="TQProgressBar" row="2" column="4"> <property name="name"> <cstring>charProgress7Level</cstring> </property> </widget> - <widget class="QProgressBar" row="3" column="4"> + <widget class="TQProgressBar" row="3" column="4"> <property name="name"> <cstring>charProgress8Level</cstring> </property> </widget> - <widget class="QProgressBar" row="3" column="1"> + <widget class="TQProgressBar" row="3" column="1"> <property name="name"> <cstring>charProgress4Level</cstring> </property> </widget> - <widget class="QLabel" row="3" column="3"> + <widget class="TQLabel" row="3" column="3"> <property name="name"> <cstring>charLabel8Level</cstring> </property> @@ -807,7 +807,7 @@ <string>h:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>charLabel4Level</cstring> </property> @@ -817,7 +817,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>groupBox5_2</cstring> </property> @@ -828,7 +828,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel6_3</cstring> </property> @@ -836,7 +836,7 @@ <string>Characters per minute:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel6_2_2</cstring> </property> @@ -844,11 +844,11 @@ <string>Words per minute:</string> </property> </widget> - <widget class="QLCDNumber" row="0" column="1"> + <widget class="TQLCDNumber" row="0" column="1"> <property name="name"> <cstring>charSpeedLCDLevel</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -858,11 +858,11 @@ <enum>Flat</enum> </property> </widget> - <widget class="QLCDNumber" row="1" column="1"> + <widget class="TQLCDNumber" row="1" column="1"> <property name="name"> <cstring>wordSpeedLCDLevel</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -874,7 +874,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="1"> + <widget class="TQGroupBox" row="1" column="1"> <property name="name"> <cstring>groupBox6_3</cstring> </property> @@ -885,7 +885,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QProgressBar" row="0" column="0"> + <widget class="TQProgressBar" row="0" column="0"> <property name="name"> <cstring>correctnessBarLevel</cstring> </property> @@ -904,7 +904,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>89</height> @@ -913,7 +913,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>progressTab</cstring> </property> @@ -924,7 +924,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentTitleLabel_2</cstring> </property> @@ -938,15 +938,15 @@ <string>Your Typing Progress</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -985,7 +985,7 @@ </sizepolicy> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6_2</cstring> </property> @@ -1004,7 +1004,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -1021,7 +1021,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -1034,7 +1034,7 @@ <string>Chart Data</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>levelsRadio</cstring> </property> @@ -1042,7 +1042,7 @@ <string>Level stats</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>sessionsRadio</cstring> </property> @@ -1060,7 +1060,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -1069,7 +1069,7 @@ </spacer> </vbox> </widget> - <widget class="QButtonGroup" row="0" column="1"> + <widget class="TQButtonGroup" row="0" column="1"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -1086,7 +1086,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -1099,7 +1099,7 @@ <string>Chart Type</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>WPMRadio</cstring> </property> @@ -1107,7 +1107,7 @@ <string>Words per minute</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>CPMRadio</cstring> </property> @@ -1115,7 +1115,7 @@ <string>Characters per minute</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>correctRadio</cstring> </property> @@ -1123,7 +1123,7 @@ <string>Correctness</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>skillRadio</cstring> </property> @@ -1133,7 +1133,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup" row="0" column="2"> + <widget class="TQButtonGroup" row="0" column="2"> <property name="name"> <cstring>buttonGroup3</cstring> </property> @@ -1150,7 +1150,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -1163,7 +1163,7 @@ <string>Time Axis Scaling</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>timeRadio</cstring> </property> @@ -1171,7 +1171,7 @@ <string>Time scaled</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>eventRadio</cstring> </property> @@ -1189,7 +1189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1203,9 +1203,9 @@ </vbox> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -1232,7 +1232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -1277,7 +1277,7 @@ <data format="PNG" length="1525">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af4000005bc494441545885b596416823d719c77f0e0a8c0e0b12b860810533a0057bd88035642133908087e4a29ea2b087684fb1c9253db57b6b4ba125c9a15d07127613ca3a7bc93a812e524f514a4b9f601b3f85763d0e6d7676a1c623b0f00c8989442ca281085e0e23c9abeccab10dd1e5cfa7ff7fbef7f17fdffbde9b9152729a9ff3c7b2e249601e683f84df01518c7cab3e739a7c4f9c76f1e5175cd45f42767f2f27f0da1fae41ea34d9ce500003b86c97a10fc63963022b4f9560f053178046bd558734888e98c00f831aa0fdc4050cc0d61d36bedac0c81a63fcedfdd779bf179ec981999336a1f3ebb262a0b1fc2b93d75ffc0d624fd09d8d119f49c24c4cf77e4cfc5e07882106f94eed44cd78620734ad84fe4a96f8e90e6bff5b030dea77ebc4f3314431994517ede52cdacb39e8c5274d7bf2be8d6341743b4dfa1c68cf77a8b56a68058dce4e8ca643bc23a00df15f4378d03d7101277640bef9e18cf8ddfb33c1bb45d29fe4585d588528a654709385ff0ff1ed101e4448294f3c0b4e75726dc7517d60b53547358ac9bd92a3f185a0fb51cceaed80abbd98e6291687a103eb37d6d55cacaba59eadec595bf57b4ad9b3f651dcedabddc6be626e0ee4d75c7ee31a57e7aee0ffa98fd62873ed992b5cfdfb3ebcbd8efd9cab36ffe54d7eff50bea5595b6d363695e3382ab1564a565e7d4d6dca2da5be566aebdf09def3ee25f110d7ff7c4ba94b2b6acbdb52eacba16ef707fa7da5fe79a1a8befdeff0bb7d95e87f90ef5b5f29fb695b49298f7ac02958c82f2456c682cfc12c98f8918f55302102d77091c458058bfedd3eb9410eb123b0162c8812bd17f9b8291722b0e64daa8d2a967ec48ff3b58f36ff0948e697d7f6710a0e1f3ff818162088024cdd248802d041ec099c94461005a40b69bcae87bbe08ef9200ab0741381205d003ff271175dfcb63fe647f9d2058807c3a39a6cc18a52df28a57695524aa97b7e82a358ed2ab57f675fa94b9547fe9f405f29b564abcd3b5bc7ea36ef6ca92bcf5c39da020d0dbf1d8001e15e88b998e028c6001148483dfaff04164010e3e8d6b13a47b7900379b4053160160c082197cf3d16ddf30e92e97c2e9f4b7a85a4077e4cf7480f84510839e81ff61f8bb5ed3ace603adf3fec431e0402e67f44a71ff5402a712026d3cd50fdac8a356b210291747d20710c07bfe763e78ad0af430b36b63770f2ce981781a0b458421c087e0e543fade2165c6adbb5313fca572a96a8efd493d332728001d477ea94164af8b14fe562053ff6295f2ce3c73ece9c43fd7e1d7a1d444b502e9627f8cac50a5ed7c39977905188756821db72821fe9655b621d5ad4bb7560781dafdf5857cebc8377e0e1ea2ea225707407d99238f30ea22558fc6a91dcce4d4ab3650492d200825e17139b6ae63e2e207a5d8c94cbdaf990d24209d112b8ba8b6ccb713e5777b9d9b849fd6f75a4943353df03b73eb8a5aefff23a5ed7c39ab7f0da93281e48363ed8c05ab2f8c5a5d547f8116efca3caf5f7d6587b6bedb177c4d4dbb074e125e8825518262b587090c4fe818f7bc1219bc95259aee01ff85873c9c41bf123fd65fb25346dfa536d6a018d9648cef5e7024333f0a364a2f9918fa92763d5c646b69b98ba49f56e150a933c3ac8c89bbaf8b1052ceb2e7e04aeeea2451aa66e8e67fa089b3471f5e4dc97164af82d7f82274aee98e3de8ac73a6016202024fd429a200ae13c04ed214621a4a01949380f91d6c57cca3ce287e8b5bd635f1dc738604304869183bd2938887175673abf47721b9ecd8126e4210c3b9087ce101f8eedd432b22da7f2e4939e38bb0321e47259e84076880fc7cd4183e26c110e1fcf7308e69c79ac03536b6bb41a38070eb54f6ad8039bc6a0c1726a99e6a089abb9f83ff301a86dd7707b2eb5ffd4c6bc9d4af4e54c192f7dc61e28668a881d41e56285201fb0f2ec0a413ea0f26c053f978ce7ce4107e349032ff226f891de3be761680651144d2d60ea245cbfb1aea270fa870c407c2a282e15c966b25365e141c8f6ddeda94ff5ef018e80fecc25cb29330000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>ktouchchartwidget.h</includehint> diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index 08fdff35..b58802fd 100644 --- a/ktouch/src/ktouchstatisticsdata.cpp +++ b/ktouch/src/ktouchstatisticsdata.cpp @@ -41,7 +41,7 @@ int KTouchCharStats::missHitRatio() const { // ---------------------------------------------------------------------------- TQTextStream& operator<<(TQTextStream &out, const KTouchCharStats &ch) { - return (out << ch.m_char.unicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount); + return (out << ch.m_char.tqunicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount); } // ---------------------------------------------------------------------------- @@ -98,7 +98,7 @@ bool KTouchLevelStats::read(TQDomNode in) { n = in.namedItem("Time"); if (!n.isNull()) { TQString timestring = n.firstChild().nodeValue(); - if (timestring != TQString::null) + if (timestring != TQString()) m_timeRecorded = TQDateTime::fromString(timestring, Qt::ISODate); } // read characters @@ -135,10 +135,10 @@ void KTouchLevelStats::write(TQDomDocument& doc, TQDomElement& root) const { level.appendChild(e); // add char stats TQString char_data; - // we append for each missed char the char-unicode and the counters + // we append for each missed char the char-tqunicode and the counters for (std::set<KTouchCharStats>::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it) - char_data += TQString(" %1 %2 %3").arg(it->m_char.unicode()) - .arg(it->m_correctCount).arg(it->m_wrongCount); + char_data += TQString(" %1 %2 %3").tqarg(it->m_char.tqunicode()) + .tqarg(it->m_correctCount).tqarg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); e.appendChild(tn); @@ -157,7 +157,7 @@ void KTouchLevelStats::addCorrectChar(TQChar key) { else ++(const_cast<KTouchCharStats&>(*it).m_correctCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::find(). The non-const overload is missing and find() always + // implementation of set::tqfind(). The non-const overload is missing and tqfind() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -179,7 +179,7 @@ void KTouchLevelStats::addWrongChar(TQChar key) { else ++(const_cast<KTouchCharStats&>(*it).m_wrongCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::find(). The non-const overload is missing and find() always + // implementation of set::tqfind(). The non-const overload is missing and tqfind() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -244,7 +244,7 @@ bool KTouchSessionStats::read(TQDomNode in) { n = in.namedItem("Time"); if (!n.isNull()) { TQString timestring = n.firstChild().nodeValue(); - if (timestring != TQString::null) + if (timestring != TQString()) m_timeRecorded = TQDateTime::fromString(timestring, Qt::ISODate); } // read level numbers @@ -295,17 +295,17 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const { // add levels TQString level_nums; for (std::set<unsigned int>::const_iterator it = m_levelNums.begin(); it != m_levelNums.end(); ++it) - level_nums += TQString( " %1").arg(*it); + level_nums += TQString( " %1").tqarg(*it); e = doc.createElement("LevelNums"); tn = doc.createTextNode(level_nums); e.appendChild(tn); session.appendChild(e); // add char data TQString char_data; - // we append for each missed char the char-unicode and the counters + // we append for each missed char the char-tqunicode and the counters for (std::set<KTouchCharStats>::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it) - char_data += TQString(" %1 %2 %3").arg(it->m_char.unicode()) - .arg(it->m_correctCount).arg(it->m_wrongCount); + char_data += TQString(" %1 %2 %3").tqarg(it->m_char.tqunicode()) + .tqarg(it->m_correctCount).tqarg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); e.appendChild(tn); @@ -324,7 +324,7 @@ void KTouchSessionStats::addCorrectChar(TQChar key) { else ++(const_cast<KTouchCharStats&>(*it).m_correctCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::find(). The non-const overload is missing and find() always + // implementation of set::tqfind(). The non-const overload is missing and tqfind() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -346,7 +346,7 @@ void KTouchSessionStats::addWrongChar(TQChar key) { else ++(const_cast<KTouchCharStats&>(*it).m_wrongCount); // this const_cast is necessary because the current gcc 3.2 has a bug in the - // implementation of set::find(). The non-const overload is missing and find() always + // implementation of set::tqfind(). The non-const overload is missing and tqfind() always // returns a const object. Maybe in the next release this will be fixed. Until then // the const_cast helps. } @@ -357,8 +357,8 @@ void KTouchSessionStats::addWrongChar(TQChar key) { // *** KTouchLectureStats *** void KTouchLectureStats::clear() { - m_lectureTitle = TQString::null; - m_lectureURL = TQString::null; + m_lectureTitle = TQString(); + m_lectureURL = TQString(); m_levelStats.clear(); m_sessionStats.clear(); } @@ -464,7 +464,7 @@ bool KTouchStatisticsData::read(TQWidget * window, const KURL& url) { #ifdef COMPRESSED_XML_STATISTICS TQByteArray array; array = infile.readAll(); - array = qUncompress(array); + array = tqUncompress(array); doc.setContent( array ); #else doc.setContent( &infile ); @@ -503,7 +503,7 @@ bool KTouchStatisticsData::write(TQWidget * window, const KURL& url) const { TQByteArray array; TQTextStream out(array, IO_WriteOnly); out << doc.toString(); - array = qCompress(array); + array = tqCompress(array); outfile.writeBlock(array); #else TQTextStream out( &outfile ); diff --git a/ktouch/src/ktouchstatisticsdata.h b/ktouch/src/ktouchstatisticsdata.h index 15ab2f82..3ddbf941 100644 --- a/ktouch/src/ktouchstatisticsdata.h +++ b/ktouch/src/ktouchstatisticsdata.h @@ -113,7 +113,7 @@ class KTouchLevelStats { unsigned int m_words; ///< The number of typed words. unsigned int m_totalChars; ///< The total number of chars typed this level. unsigned int m_correctChars; ///< The total number of correctly typed chars. - QDateTime m_timeRecorded; ///< The time at which the level stats were recorded. + TQDateTime m_timeRecorded; ///< The time at which the level stats were recorded. }; @@ -148,7 +148,7 @@ class KTouchSessionStats { unsigned int m_words; ///< The number of typed words. unsigned int m_totalChars; ///< The total number of chars typed this session. unsigned int m_correctChars; ///< The total number of correctly typed chars. - QDateTime m_timeRecorded; ///< The time at which the session stats were recorded. + TQDateTime m_timeRecorded; ///< The time at which the session stats were recorded. }; @@ -171,7 +171,7 @@ class KTouchLectureStats { /// Writes the lecture statistics to the XML document. void write(TQDomDocument& doc, TQDomElement& root) const; - QString m_lectureTitle; ///< The descriptive title of the lecture. + TQString m_lectureTitle; ///< The descriptive title of the lecture. KURL m_lectureURL; ///< The descriptive title of the lecture. TQValueVector<KTouchLevelStats> m_levelStats; ///< The statistics for all levels in this lecture. diff --git a/ktouch/src/ktouchstatus.cpp b/ktouch/src/ktouchstatus.cpp index 94d11894..9ca6a4f2 100644 --- a/ktouch/src/ktouchstatus.cpp +++ b/ktouch/src/ktouchstatus.cpp @@ -20,13 +20,13 @@ #include <kpushbutton.h> #include "prefs.h" -KTouchStatus::KTouchStatus(TQWidget *parent) - : KTouchStatusLayout(parent) +KTouchtqStatus::KTouchtqStatus(TQWidget *tqparent) + : KTouchStatusLayout(tqparent) { applyPreferences(); } -void KTouchStatus::applyPreferences() { +void KTouchtqStatus::applyPreferences() { if (Prefs::autoLevelChange()) { levelUpBtn->setEnabled( !Prefs::disableManualLevelChange() ); levelDownBtn->setEnabled( !Prefs::disableManualLevelChange() ); @@ -37,11 +37,11 @@ void KTouchStatus::applyPreferences() { } } -void KTouchStatus::setNewChars(const TQString& newChars) { +void KTouchtqStatus::setNewChars(const TQString& newChars) { newCharsLabel->setText(newChars); } -void KTouchStatus::updateStatus(unsigned int level, double correctness) { +void KTouchtqStatus::updatetqStatus(unsigned int level, double correctness) { levelLCD->display(static_cast<int>(level)+1); // +1 because our level variable ranges from 0...n-1 correctnessBar->setProgress(static_cast<int>(correctness*100) ); } diff --git a/ktouch/src/ktouchstatus.h b/ktouch/src/ktouchstatus.h index 72bb6acc..d44d91c4 100644 --- a/ktouch/src/ktouchstatus.h +++ b/ktouch/src/ktouchstatus.h @@ -22,20 +22,21 @@ /** This is the implementation of the status widget (at the top of the main view). * It simply displays the status but does not have a functionality of its own. * Everythings is calculated in the trainer (see KTouchTrainer)and then displayed - * using the updateStatus() member function. + * using the updatetqStatus() member function. * The "new characters" string is set using the member function setNewChars(). */ -class KTouchStatus : public KTouchStatusLayout { +class KTouchtqStatus : public KTouchStatusLayout { Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchStatus(TQWidget *parent); + KTouchtqStatus(TQWidget *tqparent); /// Called when the preferences have changed in the configuration dialog. void applyPreferences(); /// Sets the new characters text. void setNewChars(const TQString& newChars); /// Updates the level LCD and the correctness progress bar - void updateStatus(unsigned int level, double correctness); + void updatetqStatus(unsigned int level, double correctness); }; #endif // KTOUCHSTATUS_H diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui index 80b29f9f..9041a07a 100644 --- a/ktouch/src/ktouchstatuslayout.ui +++ b/ktouch/src/ktouchstatuslayout.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KTouchStatusLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KTouchStatusLayout</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -24,7 +24,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -38,15 +38,15 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLCDNumber"> + <widget class="TQLCDNumber"> <property name="name"> <cstring>levelLCD</cstring> </property> @@ -58,7 +58,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>30</height> @@ -83,19 +83,19 @@ <string>This shows which level you are at.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>levelUpBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>20</height> @@ -108,11 +108,11 @@ <string>+</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>levelDownBtn</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>20</height> @@ -131,7 +131,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox11</cstring> </property> @@ -160,18 +160,18 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> </size> </property> </spacer> - <widget class="QLCDNumber"> + <widget class="TQLCDNumber"> <property name="name"> <cstring>speedLCD</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>30</height> @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> @@ -212,7 +212,7 @@ </spacer> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox12</cstring> </property> @@ -233,14 +233,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> </size> </property> </spacer> - <widget class="QProgressBar"> + <widget class="TQProgressBar"> <property name="name"> <cstring>correctnessBar</cstring> </property> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> @@ -270,7 +270,7 @@ </spacer> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -291,14 +291,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>newCharsLabel</cstring> </property> @@ -321,7 +321,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -337,7 +337,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> @@ -348,13 +348,13 @@ </widget> </hbox> </widget> -<slots> +<Q_SLOTS> <slot>levelForcedDown()</slot> <slot>levelForcedUp()</slot> <slot>showStatChanged(int)</slot> <slot>runningStateChanged(int)</slot> <slot>startKTouch()</slot> <slot>stopKTouch()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp index 7ed140ca..b2e48277 100644 --- a/ktouch/src/ktouchtrainer.cpp +++ b/ktouch/src/ktouchtrainer.cpp @@ -31,7 +31,7 @@ #include "ktouchdefaults.h" #include "prefs.h" -KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture) +KTouchTrainer::KTouchTrainer(KTouchtqStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture) : TQObject(), m_trainingTimer(new TQTimer), m_statusWidget(status), @@ -233,7 +233,7 @@ void KTouchTrainer::enterPressed() { void KTouchTrainer::updateWidgets() { // update status widget - m_statusWidget->updateStatus(m_level, m_levelStats.correctness()); + m_statusWidget->updatetqStatus(m_level, m_levelStats.correctness()); // update slide line widget m_slideLineWidget->setStudentText(m_studentText); // update keyboard widget -> show next to be pressed char. @@ -270,7 +270,7 @@ void KTouchTrainer::startTraining(bool keepLevel) { gotoFirstLine(); updateStatusBarMessage(i18n("Starting training session: Waiting for first keypress...") ); updateStatusBar(); - m_statusWidget->updateStatus(m_level, 1); + m_statusWidget->updatetqStatus(m_level, 1); m_statusWidget->speedLCD->display( 0 ); m_trainingPaused=true; // Go into "Pause" mode m_trainingTimer->stop(); // Training timer will be started on first keypress. @@ -285,7 +285,7 @@ void KTouchTrainer::pauseTraining() { m_trainingPaused=true; m_trainingTimer->stop(); m_slideLineWidget->setCursorTimerEnabled(false); - m_statusWidget->updateStatus(m_level, m_levelStats.correctness()); + m_statusWidget->updatetqStatus(m_level, m_levelStats.correctness()); m_statusWidget->speedLCD->display( m_levelStats.charSpeed() ); updateStatusBarMessage(i18n("Training session paused. Training continues on next keypress...") ); updateStatusBar(); @@ -298,7 +298,7 @@ void KTouchTrainer::pauseTraining() { void KTouchTrainer::continueTraining() { m_trainingPaused=false; m_slideLineWidget->setCursorTimerEnabled(true); - m_statusWidget->updateStatus(m_level, m_levelStats.correctness() ); + m_statusWidget->updatetqStatus(m_level, m_levelStats.correctness() ); m_statusWidget->speedLCD->display( m_levelStats.charSpeed() ); updateStatusBarMessage(i18n("Training session! The time is running...") ); updateStatusBar(); @@ -317,12 +317,12 @@ void KTouchTrainer::storeTrainingStatistics() { // are there level stats to be stored? if (m_levelStats.m_elapsedTime != 0) { //kdDebug() << "[KTouchTrainer::storeTrainingStatistics] Storing level statistics!" << endl; - m_levelStats.m_timeRecorded = TQDateTime::currentDateTime(); + m_levelStats.m_timeRecorded = TQDateTime::tqcurrentDateTime(); data.m_levelStats.push_back( m_levelStats ); } if (m_sessionStats.m_elapsedTime != 0) { //kdDebug() << "[KTouchTrainer::storeTrainingStatistics] Storing session statistics!" << endl; - m_sessionStats.m_timeRecorded = TQDateTime::currentDateTime(); + m_sessionStats.m_timeRecorded = TQDateTime::tqcurrentDateTime(); data.m_sessionStats.push_back( m_sessionStats ); } } @@ -487,7 +487,7 @@ void KTouchTrainer::statsChangeLevel() { // are there level stats to be stored? if (m_levelStats.m_elapsedTime != 0) { //kdDebug() << "[KTouchTrainer::storeTrainingStatistics] Storing level statistics!" << endl; - m_levelStats.m_timeRecorded = TQDateTime::currentDateTime(); + m_levelStats.m_timeRecorded = TQDateTime::tqcurrentDateTime(); data.m_levelStats.push_back( m_levelStats ); } // clear level stats @@ -497,6 +497,6 @@ void KTouchTrainer::statsChangeLevel() { // remember level in session stats m_sessionStats.m_levelNums.insert(m_level); // show new level (in status widet) and 100% correctness - m_statusWidget->updateStatus(m_level, 1); + m_statusWidget->updatetqStatus(m_level, 1); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchtrainer.h b/ktouch/src/ktouchtrainer.h index f625d67b..4dba8ebc 100644 --- a/ktouch/src/ktouchtrainer.h +++ b/ktouch/src/ktouchtrainer.h @@ -23,7 +23,7 @@ class TQTimer; -class KTouchStatus; +class KTouchtqStatus; class KTouchSlideLine; class KTouchKeyboardWidget; class KTouchLecture; @@ -59,9 +59,10 @@ class KTouchLecture; /// is updated. class KTouchTrainer : public TQObject { Q_OBJECT + TQ_OBJECT public: /// Constructor. - KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture); + KTouchTrainer(KTouchtqStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture); /// Destructor virtual ~KTouchTrainer(); /// Jumps to the first line in the current level (m_level) (Note: has no effect on the training statistics). @@ -148,7 +149,7 @@ class KTouchTrainer : public TQObject { /// right before a new level and new line is started). void statsChangeLevel(); - KTouchStatus *m_statusWidget; ///< Pointer to the status widget on top of the main window. + KTouchtqStatus *m_statusWidget; ///< Pointer to the status widget on top of the main window. KTouchSlideLine *m_slideLineWidget; ///< Pointer to the sliding line widget. KTouchKeyboardWidget *m_keyboardWidget; ///< Pointer to the keyboard widget. KTouchLecture *m_lecture; ///< Pointer to the lecture data. diff --git a/ktouch/src/ktouchutils.cpp b/ktouch/src/ktouchutils.cpp index a59dbfd9..26686a09 100644 --- a/ktouch/src/ktouchutils.cpp +++ b/ktouch/src/ktouchutils.cpp @@ -21,7 +21,7 @@ TQString format_speed(double speed) { unsigned int mins = static_cast<unsigned int>(speed); unsigned int secs = static_cast<unsigned int>(speed*60) - mins*60; - return TQString("%1' %2''").arg(mins).arg(secs); + return TQString("%1' %2''").tqarg(mins).tqarg(secs); } void sort_lists(TQStringList& text, TQStringList& data) { |