diff options
Diffstat (limited to 'ktouch')
72 files changed, 299 insertions, 299 deletions
diff --git a/ktouch/ChangeLog b/ktouch/ChangeLog index 58ac84b8..2a918ddc 100644 --- a/ktouch/ChangeLog +++ b/ktouch/ChangeLog @@ -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 tqlayout for switzerland-german keyboards + * Added: new keyboard layout for switzerland-german keyboards 2004-11-02 Andreas Nicolai <[email protected]> * Added: checks in the quick-select menues diff --git a/ktouch/keyboards/be.keyboard b/ktouch/keyboards/be.keyboard index 6de3fa0c..3995e5fd 100644 --- a/ktouch/keyboards/be.keyboard +++ b/ktouch/keyboards/be.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout 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 tqunicode number tells the program +# but the key. The FingerKey unicode 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 tqunicode and then also -# the tqunicode for the base character on the key to be pressed. +# Define the character via its unicode and then also +# the unicode 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 57c0f657..87a71a62 100644 --- a/ktouch/keyboards/bg.keyboard +++ b/ktouch/keyboards/bg.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout 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 10d7ac7e..170fe821 100644 --- a/ktouch/keyboards/de.keyboard +++ b/ktouch/keyboards/de.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for german keybord tqlayout +# Keybord layout file for german keybord layout # 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 6fce086a..9f2c883e 100644 --- a/ktouch/keyboards/de.neo.keyboard +++ b/ktouch/keyboards/de.neo.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout 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 d02d2826..95c494db 100644 --- a/ktouch/keyboards/de.swiss.keyboard +++ b/ktouch/keyboards/de.swiss.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for german kaybord tqlayout +# Keybord layout file for german kaybord layout # 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 23f7128e..7b781aa8 100644 --- a/ktouch/keyboards/dk.keyboard +++ b/ktouch/keyboards/dk.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Danish kaybord +# Keybord layout 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 f80bdffe..6b90ed3e 100644 --- a/ktouch/keyboards/dvorak_fr.keyboard +++ b/ktouch/keyboards/dvorak_fr.keyboard @@ -1,7 +1,7 @@ # -*- coding: utf-8; -*- #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # Matthieu MOY, December 7th 2004 diff --git a/ktouch/keyboards/ee.keyboard b/ktouch/keyboards/ee.keyboard index 7e79a353..bd2a880e 100644 --- a/ktouch/keyboards/ee.keyboard +++ b/ktouch/keyboards/ee.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/en.dvorak.keyboard b/ktouch/keyboards/en.dvorak.keyboard index 295d4f43..d191f544 100644 --- a/ktouch/keyboards/en.dvorak.keyboard +++ b/ktouch/keyboards/en.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout 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 84a3f31b..c0e9f2d1 100644 --- a/ktouch/keyboards/en.keyboard +++ b/ktouch/keyboards/en.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout 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 tqunicode number tells the program +# but the key. The FingerKey unicode 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 tqunicode and then also -# the tqunicode for the base character on the key to be pressed. +# Define the character via its unicode and then also +# the unicode 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 56da935b..2dd84046 100644 --- a/ktouch/keyboards/es.dvorak.keyboard +++ b/ktouch/keyboards/es.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/es.keyboard b/ktouch/keyboards/es.keyboard index cae885f8..5211488e 100644 --- a/ktouch/keyboards/es.keyboard +++ b/ktouch/keyboards/es.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fi.keyboard b/ktouch/keyboards/fi.keyboard index 10775703..9edcd996 100644 --- a/ktouch/keyboards/fi.keyboard +++ b/ktouch/keyboards/fi.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fr.a.keyboard b/ktouch/keyboards/fr.a.keyboard index 0916da15..d18e4cfb 100644 --- a/ktouch/keyboards/fr.a.keyboard +++ b/ktouch/keyboards/fr.a.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fr.keyboard b/ktouch/keyboards/fr.keyboard index 81f54847..edfcf537 100644 --- a/ktouch/keyboards/fr.keyboard +++ b/ktouch/keyboards/fr.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fr.swiss.keyboard b/ktouch/keyboards/fr.swiss.keyboard index e56f6bf6..ba89c072 100644 --- a/ktouch/keyboards/fr.swiss.keyboard +++ b/ktouch/keyboards/fr.swiss.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for swiss french keybord tqlayout +# Keybord layout file for swiss french keybord layout #################################################### # # Assci KeyText x y diff --git a/ktouch/keyboards/he.keyboard b/ktouch/keyboards/he.keyboard index f09db772..e03f5bd1 100644 --- a/ktouch/keyboards/he.keyboard +++ b/ktouch/keyboards/he.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Hebrew +# Keybord layout file for Hebrew #################################################### # # diff --git a/ktouch/keyboards/hu.keyboard b/ktouch/keyboards/hu.keyboard index bdf90711..afd77ef1 100644 --- a/ktouch/keyboards/hu.keyboard +++ b/ktouch/keyboards/hu.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Hungarian keybord tqlayout file +# Hungarian keybord layout file # Code=UTF-8 #################################################### # diff --git a/ktouch/keyboards/it.keyboard b/ktouch/keyboards/it.keyboard index 1d99b944..3f9c5828 100644 --- a/ktouch/keyboards/it.keyboard +++ b/ktouch/keyboards/it.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/la.keyboard b/ktouch/keyboards/la.keyboard index 0094f924..55d6c6cd 100644 --- a/ktouch/keyboards/la.keyboard +++ b/ktouch/keyboards/la.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Latin keyboard +# Keybord layout file for Latin keyboard #################################################### # # diff --git a/ktouch/keyboards/nb.keyboard b/ktouch/keyboards/nb.keyboard index 13448d50..ca4f503d 100644 --- a/ktouch/keyboards/nb.keyboard +++ b/ktouch/keyboards/nb.keyboard @@ -1,11 +1,11 @@ #################################################### # KTouch -# Keybord tqlayout file for Norwegian keyboard +# Keybord layout 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/tqunicode/ +# over html codes -- see http://www.fileformat.info/info/unicode/ # # Refer to file en.keyboard for details. #################################################### diff --git a/ktouch/keyboards/nn.keyboard b/ktouch/keyboards/nn.keyboard index c6592195..79e9675b 100644 --- a/ktouch/keyboards/nn.keyboard +++ b/ktouch/keyboards/nn.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Norwegian kaybord +# Keybord layout file for Norwegian kaybord #################################################### # # Assci KeyText x y diff --git a/ktouch/keyboards/pl.keyboard b/ktouch/keyboards/pl.keyboard index fbb3961a..8c5c3590 100644 --- a/ktouch/keyboards/pl.keyboard +++ b/ktouch/keyboards/pl.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Polish (utf-8) +# Keybord layout 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 fe0e7bd9..be9af86f 100644 --- a/ktouch/keyboards/pt.br.keyboard +++ b/ktouch/keyboards/pt.br.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for brazilian keyboard +# Keybord layout file for brazilian keyboard #################################################### # # diff --git a/ktouch/keyboards/pt.keyboard b/ktouch/keyboards/pt.keyboard index 0309d97f..287c431d 100644 --- a/ktouch/keyboards/pt.keyboard +++ b/ktouch/keyboards/pt.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for portuguese keyboard +# Keybord layout file for portuguese keyboard #################################################### # # diff --git a/ktouch/keyboards/ru.2.keyboard b/ktouch/keyboards/ru.2.keyboard index c2645a1a..a3cf2039 100644 --- a/ktouch/keyboards/ru.2.keyboard +++ b/ktouch/keyboards/ru.2.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/ru.3.keyboard b/ktouch/keyboards/ru.3.keyboard index af32a33a..24d925a1 100644 --- a/ktouch/keyboards/ru.3.keyboard +++ b/ktouch/keyboards/ru.3.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Russian +# Keybord layout file for Russian # Miha Ulanov ([email protected]) # Code=UTF-8 #################################################### diff --git a/ktouch/keyboards/ru.basic.keyboard b/ktouch/keyboards/ru.basic.keyboard index 15fa4ce8..df3cfb77 100644 --- a/ktouch/keyboards/ru.basic.keyboard +++ b/ktouch/keyboards/ru.basic.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian basic keyboard tqlayout file for KTouch. +# Russian basic keyboard layout file for KTouch. # # Created by Alexander Pravdin <[email protected]>. # diff --git a/ktouch/keyboards/ru.keyboard b/ktouch/keyboards/ru.keyboard index f249ad83..651addf8 100644 --- a/ktouch/keyboards/ru.keyboard +++ b/ktouch/keyboards/ru.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian Windows keyboard tqlayout file for KTouch. +# Russian Windows keyboard layout file for KTouch. # # Created by Alexander Pravdin <[email protected]>. # diff --git a/ktouch/keyboards/ru.typewriter.keyboard b/ktouch/keyboards/ru.typewriter.keyboard index c57e17ac..67f16032 100644 --- a/ktouch/keyboards/ru.typewriter.keyboard +++ b/ktouch/keyboards/ru.typewriter.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian typewriter keyboard tqlayout file for KTouch. +# Russian typewriter keyboard layout file for KTouch. # # Created by Alexander Pravdin <[email protected]>. # diff --git a/ktouch/keyboards/ru.winkeys.keyboard b/ktouch/keyboards/ru.winkeys.keyboard index 024d1c2c..5d412f99 100644 --- a/ktouch/keyboards/ru.winkeys.keyboard +++ b/ktouch/keyboards/ru.winkeys.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian winkeys keyboard tqlayout file for KTouch. +# Russian winkeys keyboard layout file for KTouch. # # Created by Alexander Pravdin <[email protected]>. # diff --git a/ktouch/keyboards/sl.keyboard b/ktouch/keyboards/sl.keyboard index 6918a8ae..2f482f39 100644 --- a/ktouch/keyboards/sl.keyboard +++ b/ktouch/keyboards/sl.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for slovenian keybord tqlayout +# Keybord layout file for slovenian keybord layout # Code=UTF-8 #################################################### # diff --git a/ktouch/keyboards/sv.dvorak.keyboard b/ktouch/keyboards/sv.dvorak.keyboard index e81e1c0b..acb0acab 100644 --- a/ktouch/keyboards/sv.dvorak.keyboard +++ b/ktouch/keyboards/sv.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Swedish Dvorak Keybord tqlayout file +# Swedish Dvorak Keybord layout file #################################################### # # Ascii KeyText x y diff --git a/ktouch/keyboards/sv.keyboard b/ktouch/keyboards/sv.keyboard index 9e9ba96c..597a315d 100644 --- a/ktouch/keyboards/sv.keyboard +++ b/ktouch/keyboards/sv.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for swedish keybord tqlayout +# Keybord layout file for swedish keybord layout # 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 1953e9d4..92c08944 100644 --- a/ktouch/keyboards/tr.f.keyboard +++ b/ktouch/keyboards/tr.f.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Turkish F Keybord tqlayout file +# Turkish F Keybord layout 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 cfdac334..2fb7e1c2 100644 --- a/ktouch/keyboards/tr.q.keyboard +++ b/ktouch/keyboards/tr.q.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/uk.basic.keyboard b/ktouch/keyboards/uk.basic.keyboard index c1807e27..6ea507c4 100644 --- a/ktouch/keyboards/uk.basic.keyboard +++ b/ktouch/keyboards/uk.basic.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian basic keyboard tqlayout file for KTouch. +# Ukrainian basic keyboard layout file for KTouch. # # Created by Alexander Pravdin <[email protected]>. # diff --git a/ktouch/keyboards/uk.typewriter.keyboard b/ktouch/keyboards/uk.typewriter.keyboard index 08c88015..129ac807 100644 --- a/ktouch/keyboards/uk.typewriter.keyboard +++ b/ktouch/keyboards/uk.typewriter.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian typewriter keyboard tqlayout file for KTouch. +# Ukrainian typewriter keyboard layout file for KTouch. # # Created by Alexander Pravdin <[email protected]>. # diff --git a/ktouch/keyboards/uk.winkeys.keyboard b/ktouch/keyboards/uk.winkeys.keyboard index 47d09711..d378df30 100644 --- a/ktouch/keyboards/uk.winkeys.keyboard +++ b/ktouch/keyboards/uk.winkeys.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian winkeys keyboard tqlayout file for KTouch. +# Ukrainian winkeys keyboard layout file for KTouch. # # Created by Alexander Pravdin <[email protected]>. # diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index cf6bd2e3..6c9a78c8 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -75,7 +75,7 @@ KTouch::KTouch() setupActions(); // create the GUI reading the ui.rc file if (!initialGeometrySet()) - resize( TQSize(700, 510).expandedTo(tqminimumSizeHint())); + resize( TQSize(700, 510).expandedTo(minimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); // Read user statistics @@ -179,10 +179,10 @@ void KTouch::keyPressEvent(TQKeyEvent *keyEvent) { if (keyEvent->text().length() > 1) { kdDebug() << "[KTouch::keyPressEvent] text = '" << TQString(keyEvent->text()).ascii() << "'" << endl; } - TQChar key = keyEvent->text().at(0); // get first tqunicode character + TQChar key = keyEvent->text().at(0); // get first unicode character // HACK : manually filter out known dead keys // bool has_dead_key = true; - switch (key.tqunicode()) { + switch (key.unicode()) { case 94 : m_lastDeadKey = TQChar(uint(94)); break; case 176 : m_lastDeadKey = TQChar(uint(176)); break; case 180 : m_lastDeadKey = TQChar(uint(180)); break; @@ -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") - .tqarg(level_correct).tqarg(level_total).tqarg(level_words), 1); + .arg(level_correct).arg(level_total).arg(level_words), 1); statusBar()->changeItem(i18n( "Session: Correct/Total chars: %1/%2 Words: %3") - .tqarg(session_correct).tqarg(session_total).tqarg(session_words), 2); + .arg(session_correct).arg(session_total).arg(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 tqlayout = " << Prefs::currentKeyboardFile() << endl; +// kdDebug() << "[KTouch::changeKeyboard] new keyboard layout = " << Prefs::currentKeyboardFile() << endl; m_keyboardLayoutAction->setCurrentItem(num); - // call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen tqlayout file is corrupt + // call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen layout 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'.").tqarg(fileName) ); + KMessageBox::sorry(0, i18n("Could not find/open the lecture file '%1'.").arg(fileName) ); m_defaultLectureAction->setCurrentItem(-1); } else { @@ -620,8 +620,8 @@ void KTouch::init() { */ } - // if keyboard tqlayout (loaded by Prefs is not available (e.g. the - // tqlayout file has been deleted) switch to default keyboard + // 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) { TQString default_keyboard; // determine locale @@ -652,18 +652,18 @@ void KTouch::init() { } // ---------------------------------------------------------------------------- -// Creates the tqlayout and GUI setup for a practice session +// Creates the layout and GUI setup for a practice session void KTouch::initTrainingSession() { //kdDebug() << "[KTouch::initTrainingSession] setting up layouts 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 KTouchtqStatus( mainLayout ); + m_statusWidget = new KTouchStatus( mainLayout ); m_slideLineWidget = new KTouchSlideLine( mainLayout ); - m_slideLineWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 1) ); + m_slideLineWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 1) ); m_keyboardWidget = new KTouchKeyboardWidget( mainLayout ); - m_keyboardWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 3) ); + m_keyboardWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 3) ); setCentralWidget(mainLayout); // apply the settings to the widgets m_slideLineWidget->applyPreferences(); @@ -753,7 +753,7 @@ void KTouch::updateFileLists() { // TODO : search in i18n() directories m_keyboardFiles = dirs->findAllResources("data","ktouch/*.keyboard"); - // remove the number tqlayout, since this is the necessary default tqlayout and will be + // remove the number layout, since this is the necessary default layout and will be // added anyway TQStringList::iterator it = m_keyboardFiles.find("number.keyboard"); if (it!=m_keyboardFiles.end()) m_keyboardFiles.remove(it); diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h index 4703fd92..ceec8abc 100644 --- a/ktouch/src/ktouch.h +++ b/ktouch/src/ktouch.h @@ -30,7 +30,7 @@ class KToggleAction; class KActionMenu; class KSelectAction; -class KTouchtqStatus; +class KTouchStatus; class KTouchSlideLine; class KTouchKeyboardWidget; class KTouchTrainer; @@ -101,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 tqlayout (called from menu). + /// Quick-changes the keyboard layout (called from menu). void changeKeyboard(int num); /// Quick-changes the colour scheme used on the keyboard (called from menu). void changeColor(int num); @@ -111,7 +111,7 @@ class KTouch : public KMainWindow { protected: /// Reimplementated to save preferences and bool queryExit(); - /// Some tqlayout fixes here... + /// Some layout fixes here... void resizeEvent(TQResizeEvent *); /// Accepts a typed char. void keyPressEvent(TQKeyEvent *keyEvent); @@ -128,7 +128,7 @@ class KTouch : public KMainWindow { /// Initialises the program during a normal startup void init(); - /// Creates the tqlayout and GUI setup for a practice session + /// Creates the layout and GUI setup for a practice session void initTrainingSession(); /// Creates the (standard) actions and entries in the menu. void setupActions(); @@ -154,7 +154,7 @@ class KTouch : public KMainWindow { KSelectAction *m_keyboardColorAction; KSelectAction *m_defaultLectureAction; - KTouchtqStatus *m_statusWidget; ///< Pointer to the status widget on top of the main widget. + KTouchStatus *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). @@ -171,8 +171,8 @@ 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 tqlayout files. - TQStringList m_keyboardTitles; ///< A list of the titles of all default keyboard tqlayout 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. KTouchStatisticsData m_stats; ///< All user statistics are kept here. diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui index 0be9d5f2..38245a56 100644 --- a/ktouch/src/ktouchcoloreditor_dlg.ui +++ b/ktouch/src/ktouchcoloreditor_dlg.ui @@ -31,7 +31,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -129,7 +129,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -179,7 +179,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -246,7 +246,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -255,7 +255,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -337,7 +337,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -367,7 +367,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <grid> <property name="name"> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -400,7 +400,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -417,7 +417,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -426,7 +426,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <grid> <property name="name"> @@ -514,7 +514,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -525,7 +525,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -617,7 +617,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <hbox> <property name="name"> diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp index 3e36f458..e447d0b8 100644 --- a/ktouch/src/ktouchcolorscheme.cpp +++ b/ktouch/src/ktouchcolorscheme.cpp @@ -12,7 +12,7 @@ #include "ktouchcolorscheme.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <kdebug.h> @@ -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").tqarg(i), m_background[i]); + READ_COLOR(TQString("KeyBack_%1").arg(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").tqarg(i), m_background[i]); + WRITE_COLOR(key_colors, TQString("KeyBack_%1").arg(i), m_background[i]); } WRITE_COLOR(key_colors, "KeyText", m_text); WRITE_COLOR(key_colors, "KeyBackHigh", m_backgroundH); diff --git a/ktouch/src/ktouchdefaults.h b/ktouch/src/ktouchdefaults.h index 8f6631db..d66a1663 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 tqlayout. +extern const int KEYBOARD_MARGIN; ///< The margin around the keybaord layout. extern const int LCD_UPDATE_INTERVAL; ///< Update interval for LCD display and statistics. diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp index f4ecf178..476a8502 100644 --- a/ktouch/src/ktouchkeyboard.cpp +++ b/ktouch/src/ktouchkeyboard.cpp @@ -34,7 +34,7 @@ void KTouchKeyboard::clear() { } // ---------------------------------------------------------------------------- -// Loads a keyboard tqlayout (old format) from file (returns true if successful). +// Loads a keyboard layout (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'.").tqarg(line); + //errorMsg = i18n("Missing key type in line '%1'.").arg(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 tqlayout" << endl; + kdDebug() << "Reading new keyboard layout" << endl; m_keys.clear(); m_connectors.clear(); 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 tqlayout"); + else m_title = i18n("untitled keyboard layout"); 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 tqlayout") ); + if (m_title.isEmpty()) titleText = doc.createTextNode( i18n("untitled keyboard layout") ); 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 tqlayout. + // First let's create the visible layout. // 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,7 +327,7 @@ void KTouchKeyboard::createDefault() { m_connectors.push_back( KTouchKeyConnector('.', '.', '6', 0) ); m_title = "Number keypad"; - m_comment = "Predefined keyboard tqlayout"; + m_comment = "Predefined keyboard layout"; m_language = TQString(); // language does not apply to numbers... that's one of the nice things with math :-) m_fontSuggestions = "Monospace"; @@ -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 tqlayout file '%1'. ").tqarg(url.url()) + msg; + *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg; return result; } else { if (errorMsg!=NULL) - *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").tqarg(url.url()); + *errorMsg = i18n("Could not download/open keyboard layout file from '%1'.").arg(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 tqlayout file for KTouch # \n"; + out << "# Keyboard layout 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.tqunicode() << '\t' << key->m_keyText << '\t' + out << key->m_keyChar.unicode() << '\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 tqlayout has changed + // let's check whether the keyboard layout has changed if (KTouchConfig().m_currentKeyboardFile!=m_currentLayout) { - // if the tqlayout is the number tqlayout just create it and we're done + // if the layout is the number layout just create it and we're done if (KTouchConfig().m_currentKeyboardFile=="number.keyboard") { createDefaultKeyboard(); resizeEvent(NULL); return; } - // ok, let's load this tqlayout + // ok, let's load this layout 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 tqlayout; the default number keypad will " - "be created instead. You can choose another keyboard tqlayout in the preferences dialog."), + 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."), 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'.").tqarg(line); + errorMsg = i18n("Missing key type in line '%1'.").arg(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 0e2ebfd6..fa88bed5 100644 --- a/ktouch/src/ktouchkeyboard.h +++ b/ktouch/src/ktouchkeyboard.h @@ -24,7 +24,7 @@ class KURL; -/// This class stores the keyboard tqlayout and the connectivity between characters +/// This class stores the keyboard layout 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 tqlayout (old format) from file (returns true if successful). + /// Loads a keyboard layout (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); @@ -47,7 +47,7 @@ class KTouchKeyboard { TQValueVector<KTouchKeyConnector> m_connectors; ///< Vector with connectivity data. 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_comment; ///< Comments about the creator of the keyboard layout. TQString m_language; ///< Language ID of keyboard TQString m_fontSuggestions; ///< Suggestions of fonts to be used on the keys. diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp index dd7b0a79..40944155 100644 --- a/ktouch/src/ktouchkeyboardeditor.cpp +++ b/ktouch/src/ktouchkeyboardeditor.cpp @@ -66,7 +66,7 @@ void KTouchKeyboardEditor::fontBtnClicked() { titleEdit->setFont(f); keyboardCommentEdit->setFont(f); languageEdit->setFont(f); - update(); // trigger tqrepaint of the keyboard. + update(); // trigger repaint of the keyboard. setModified(); } } @@ -133,7 +133,7 @@ void KTouchKeyboardEditor::paintEvent(TQPaintEvent *) { void KTouchKeyboardEditor::transfer_to_dialog() { if (m_currentURL.isEmpty()) { - titleEdit->setText( i18n("untitled keyboard tqlayout") ); + titleEdit->setText( i18n("untitled keyboard layout") ); 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").tqarg(max_x - min_x).tqarg(max_y - min_y) ); + dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").arg(max_x - min_x).arg(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 tqlayout"); + if (m_keyboard.m_title.isEmpty()) m_keyboard.m_title = i18n("untitled keyboard layout"); m_keyboard.m_comment = keyboardCommentEdit->text(); m_keyboard.m_language = languageEdit->text(); } diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui index 14c1c6bb..6f945dd2 100644 --- a/ktouch/src/ktouchkeyboardeditor_dlg.ui +++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -128,7 +128,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>100</height> @@ -169,7 +169,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -290,7 +290,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>70</height> diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index e5974acd..99cc63cc 100644 --- a/ktouch/src/ktouchkeyboardwidget.cpp +++ b/ktouch/src/ktouchkeyboardwidget.cpp @@ -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 tqlayout file '%1'. ").tqarg(url.url()) + msg; + *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg; return result; } else { if (errorMsg!=NULL) - *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").tqarg(url.url()); + *errorMsg = i18n("Could not download/open keyboard layout file from '%1'.").arg(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 tqlayout file for KTouch # \n"; + out << "# Keyboard layout 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.tqunicode() << '\t' << key->m_keyText << '\t' + out << key->m_keyChar.unicode() << '\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 tqlayout has changed + // let's check whether the keyboard layout has changed if (Prefs::currentKeyboardFile() != m_currentLayout) { - // if the tqlayout is the number tqlayout just create it and we're done + // if the layout is the number layout 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 tqlayout + // ok, let's load this layout 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 tqlayout; the default number keypad will " - "be created instead. You can choose another keyboard tqlayout in the preferences dialog."), + 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."), errorMsg); createDefaultKeyboard(); } @@ -309,7 +309,7 @@ void KTouchKeyboardWidget::createDefaultKeyboard() { updateColours(); m_currentLayout="number.keyboard"; - // create keyboard tqgeometry for new keyboard data + // create keyboard geometry 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 : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; +// kdDebug() << "read : F : unicode = " << 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 : tqunicode = " << keyAscII << " char = " << keyText << endl; +// kdDebug() << "read : C : unicode = " << 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 : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; +// kdDebug() << "read : N : unicode = " << 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 : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl; +// kdDebug() << "read : H : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl; } else { - errorMsg = i18n("Missing key type in line '%1'.").tqarg(line); + errorMsg = i18n("Missing key type in line '%1'.").arg(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 tqunicode numbers in this file" << endl; +// kdDebug() << "showing all unicode 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.tqunicode() << ") " - << "target = " << targetChar << "(" << targetChar.tqunicode() << ") " - << "finger = " << fingerChar << "(" << fingerChar.tqunicode() << ")" << endl; +/* kdDebug() << "Key #"<<++counter<<": " << ch << "(" << ch.unicode() << ") " + << "target = " << targetChar << "(" << targetChar.unicode() << ") " + << "finger = " << fingerChar << "(" << fingerChar.unicode() << ")" << endl; */ m_keyCharMap[ch] = -1; diff --git a/ktouch/src/ktouchkeyboardwidget.h b/ktouch/src/ktouchkeyboardwidget.h index d49d58e6..dfada1fa 100644 --- a/ktouch/src/ktouchkeyboardwidget.h +++ b/ktouch/src/ktouchkeyboardwidget.h @@ -30,7 +30,7 @@ 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 tqlayout from/into a file.<p> + * a keyboard layout 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> @@ -45,14 +45,14 @@ class KTouchKeyboardWidget : public TQWidget { public: /// Constructor KTouchKeyboardWidget(TQWidget *parent); - /// Reads a keyboard tqlayout from the given URL. + /// Reads a keyboard layout 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 tqlayout to the URL. + /// Saves the keyboard layout to the URL. void saveKeyboard(TQWidget * window, const KURL& url); - /// Applies preferences to the keyboard tqlayout and the keys. - /// This means that the tqlayout is basically recreated and if the tqlayout type/language + /// Applies preferences to the keyboard layout and the keys. + /// This means that the layout is basically recreated and if the layout type/language /// changed it will be reloaded. void applyPreferences(TQWidget * window, bool silent); @@ -90,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 tqlayout. + TQString m_currentLayout; ///< The name of the currently used layout. 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.h b/ktouch/src/ktouchkeys.h index df19b56d..68ffa959 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 tqshape using the painter p. + /// Paints the basic key shape 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 tqlayout). + KeyType m_type; ///< Stores the type of the key (convenience for saving of the keyboard layout). }; // --------------------------------------------------------------------------------------- @@ -116,7 +116,7 @@ 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 tqshape and painting routine then the normal keys. Therefore it is directly + * different shape and painting routine then the normal keys. Therefore it is directly * derived from KTouchKey. */ class KTouchControlKey : public KTouchBaseKey { diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp index 610c583a..c20c237d 100644 --- a/ktouch/src/ktouchlecture.cpp +++ b/ktouch/src/ktouchlecture.cpp @@ -13,7 +13,7 @@ #include "ktouchlecture.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> #include <tqdom.h> diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index 2539a204..301b70b2 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -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").tqarg(m_level+1) ); + levelLabel->setText(i18n("Data of Level %1").arg(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; diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui index a4e8f989..e12e3158 100644 --- a/ktouch/src/ktouchlectureeditor_dlg.ui +++ b/ktouch/src/ktouchlectureeditor_dlg.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>70</height> @@ -109,7 +109,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -144,7 +144,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -155,7 +155,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -165,13 +165,13 @@ <property name="name"> <cstring>upBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -188,13 +188,13 @@ <property name="name"> <cstring>downBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -211,13 +211,13 @@ <property name="name"> <cstring>newBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -242,13 +242,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -286,7 +286,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -334,7 +334,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -358,7 +358,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -486,7 +486,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -510,7 +510,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>248</width> <height>20</height> diff --git a/ktouch/src/ktouchleveldata.h b/ktouch/src/ktouchleveldata.h index a84743c2..444c4365 100644 --- a/ktouch/src/ktouchleveldata.h +++ b/ktouch/src/ktouchleveldata.h @@ -18,7 +18,7 @@ #endif #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqvaluevector.h> #include <tqdom.h> diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui index f878335f..4da33c33 100644 --- a/ktouch/src/ktouchopenrequest_dlg.ui +++ b/ktouch/src/ktouchopenrequest_dlg.ui @@ -42,7 +42,7 @@ <property name="name"> <cstring>currentRadioBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -56,7 +56,7 @@ <property name="name"> <cstring>presetRadioBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -115,7 +115,7 @@ </spacer> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -151,7 +151,7 @@ <property name="name"> <cstring>openFileRadioBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -165,7 +165,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -181,7 +181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui index 53c87079..6fd8eeea 100644 --- a/ktouch/src/ktouchprefcolorslayout.ui +++ b/ktouch/src/ktouchprefcolorslayout.ui @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -120,7 +120,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -130,7 +130,7 @@ <property name="name"> <cstring>kcfg_TeacherBackgroundColor</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -166,7 +166,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -217,7 +217,7 @@ <property name="name"> <cstring>kcfg_StudentTextColor</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -245,7 +245,7 @@ <property name="name"> <cstring>kcfg_StudentBackgroundColor</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -306,7 +306,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>34</width> <height>20</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -353,7 +353,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -369,7 +369,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -391,7 +391,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -424,7 +424,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -446,7 +446,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -485,7 +485,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui index 95c44ed6..f205c1ab 100644 --- a/ktouch/src/ktouchprefgenerallayout.ui +++ b/ktouch/src/ktouchprefgenerallayout.ui @@ -82,7 +82,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>227</width> <height>20</height> @@ -117,7 +117,7 @@ <property name="name"> <cstring>kcfg_SlidingSpeed</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -193,7 +193,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -247,7 +247,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>114</width> <height>20</height> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>30</height> diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui index 1c25d804..3105d19c 100644 --- a/ktouch/src/ktouchprefkeyboardlayout.ui +++ b/ktouch/src/ktouchprefkeyboardlayout.ui @@ -65,7 +65,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -74,7 +74,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -88,10 +88,10 @@ <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 tqlayout.</string> + <string>If checked you can specify your own keyboard font instead of the predefined one of the keyboard layout.</string> </property> <property name="whatsThis" stdset="0"> - <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> + <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> </property> </widget> <widget class="TQLabel"> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui index c2928dc0..3c6a1c8d 100644 --- a/ktouch/src/ktouchpreftraininglayout.ui +++ b/ktouch/src/ktouchpreftraininglayout.ui @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -60,7 +60,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -174,7 +174,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -310,7 +310,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp index 07078978..d7eff3fd 100644 --- a/ktouch/src/ktouchslideline.cpp +++ b/ktouch/src/ktouchslideline.cpp @@ -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 tqgeometry is invalidated, so we do: - // 1. recalculate and store the tqgeometry of the sliding lines + // when the widget is resized, the whole geometry is invalidated, so we do: + // 1. recalculate and store the geometry 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.tqbegin (TQT_TQPAINTDEVICE(m_teacherPixmap), this); + painter.begin (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 - tqrepaint(true); // trigger a paint event to erase the background + repaint(true); // trigger a paint event to erase the background updateStudentLine(); } // ---------------------------------------------------------------------------- @@ -532,7 +532,7 @@ void KTouchSlideLine::updateStudentLine() { // now let's draw the students pixmap TQPainter painter; - painter.tqbegin (TQT_TQPAINTDEVICE(m_studentPixmap), this); + painter.begin (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 8afc7b54..5abc6c2a 100644 --- a/ktouch/src/ktouchslideline.h +++ b/ktouch/src/ktouchslideline.h @@ -83,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 tqgeometry of the sliding lines. + /// This event will first recalculate the geometry of the sliding lines. /// Then the font size will be updated and through that, the sliding lines will be /// updated. void resizeEvent ( TQResizeEvent * ); diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp index c8483096..563485c3 100644 --- a/ktouch/src/ktouchstatistics.cpp +++ b/ktouch/src/ktouchstatistics.cpp @@ -161,7 +161,7 @@ void KTouchStatistics::updateCurrentSessionTab() { else levelnums += ","; } levels_count = 0; - levelnums += TQString("%1").tqarg(*it+1); + levelnums += TQString("%1").arg(*it+1); } else { @@ -233,7 +233,7 @@ void KTouchStatistics::updateCurrentSessionTab() { void KTouchStatistics::updateCurrentLevelTab() { // level info - levelLabel2->setText( TQString("%1").tqarg(m_currLevelStats.m_levelNum+1) ); + levelLabel2->setText( TQString("%1").arg(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::tqcurrentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::currentDateTime().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::tqcurrentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::currentDateTime().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::tqcurrentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::currentDateTime().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::tqcurrentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24); data.push_back(std::make_pair(tp, skill) ); } chartWidget->LeftAxis.setLabel( i18n("Skill") ); diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui index 568ed7ef..a254c9af 100644 --- a/ktouch/src/ktouchstatistics_dlg.ui +++ b/ktouch/src/ktouchstatistics_dlg.ui @@ -69,7 +69,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -127,7 +127,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <grid> <property name="name"> @@ -172,7 +172,7 @@ <property name="name"> <cstring>elapsedTimeLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -189,7 +189,7 @@ <property name="name"> <cstring>totalCharsLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -206,7 +206,7 @@ <property name="name"> <cstring>wrongCharsLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -223,7 +223,7 @@ <property name="name"> <cstring>wordsLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -264,7 +264,7 @@ <property name="name"> <cstring>frame4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -414,7 +414,7 @@ <property name="name"> <cstring>charSpeedLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -431,7 +431,7 @@ <property name="name"> <cstring>wordSpeedLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -479,7 +479,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -515,7 +515,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -573,7 +573,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout28_2</cstring> + <cstring>layout28_2</cstring> </property> <grid> <property name="name"> @@ -618,7 +618,7 @@ <property name="name"> <cstring>elapsedTimeLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -632,7 +632,7 @@ <property name="name"> <cstring>totalCharsLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -646,7 +646,7 @@ <property name="name"> <cstring>wrongCharsLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -660,7 +660,7 @@ <property name="name"> <cstring>wordsLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -698,7 +698,7 @@ <property name="name"> <cstring>frame4_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -848,7 +848,7 @@ <property name="name"> <cstring>charSpeedLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -862,7 +862,7 @@ <property name="name"> <cstring>wordSpeedLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -904,7 +904,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>89</height> @@ -940,7 +940,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -1060,7 +1060,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -1189,7 +1189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1205,7 +1205,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -1232,7 +1232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index f1b60dd0..80c92bef 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.tqunicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount); + return (out << ch.m_char.unicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount); } // ---------------------------------------------------------------------------- @@ -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-tqunicode and the counters + // we append for each missed char the char-unicode and the counters for (std::set<KTouchCharStats>::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it) - char_data += TQString(" %1 %2 %3").tqarg(it->m_char.tqunicode()) - .tqarg(it->m_correctCount).tqarg(it->m_wrongCount); + char_data += TQString(" %1 %2 %3").arg(it->m_char.unicode()) + .arg(it->m_correctCount).arg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); e.appendChild(tn); @@ -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").tqarg(*it); + level_nums += TQString( " %1").arg(*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-tqunicode and the counters + // we append for each missed char the char-unicode and the counters for (std::set<KTouchCharStats>::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it) - char_data += TQString(" %1 %2 %3").tqarg(it->m_char.tqunicode()) - .tqarg(it->m_correctCount).tqarg(it->m_wrongCount); + char_data += TQString(" %1 %2 %3").arg(it->m_char.unicode()) + .arg(it->m_correctCount).arg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); e.appendChild(tn); diff --git a/ktouch/src/ktouchstatus.cpp b/ktouch/src/ktouchstatus.cpp index bfbac46c..94d11894 100644 --- a/ktouch/src/ktouchstatus.cpp +++ b/ktouch/src/ktouchstatus.cpp @@ -20,13 +20,13 @@ #include <kpushbutton.h> #include "prefs.h" -KTouchtqStatus::KTouchtqStatus(TQWidget *parent) +KTouchStatus::KTouchStatus(TQWidget *parent) : KTouchStatusLayout(parent) { applyPreferences(); } -void KTouchtqStatus::applyPreferences() { +void KTouchStatus::applyPreferences() { if (Prefs::autoLevelChange()) { levelUpBtn->setEnabled( !Prefs::disableManualLevelChange() ); levelDownBtn->setEnabled( !Prefs::disableManualLevelChange() ); @@ -37,11 +37,11 @@ void KTouchtqStatus::applyPreferences() { } } -void KTouchtqStatus::setNewChars(const TQString& newChars) { +void KTouchStatus::setNewChars(const TQString& newChars) { newCharsLabel->setText(newChars); } -void KTouchtqStatus::updatetqStatus(unsigned int level, double correctness) { +void KTouchStatus::updateStatus(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 229ed903..f4be66f4 100644 --- a/ktouch/src/ktouchstatus.h +++ b/ktouch/src/ktouchstatus.h @@ -22,21 +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 updatetqStatus() member function. + * using the updateStatus() member function. * The "new characters" string is set using the member function setNewChars(). */ -class KTouchtqStatus : public KTouchStatusLayout { +class KTouchStatus : public KTouchStatusLayout { Q_OBJECT TQ_OBJECT public: /// Constructor - KTouchtqStatus(TQWidget *parent); + KTouchStatus(TQWidget *parent); /// 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 updatetqStatus(unsigned int level, double correctness); + void updateStatus(unsigned int level, double correctness); }; #endif // KTOUCHSTATUS_H diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui index 3721f578..b2625d23 100644 --- a/ktouch/src/ktouchstatuslayout.ui +++ b/ktouch/src/ktouchstatuslayout.ui @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -58,7 +58,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>30</height> @@ -85,7 +85,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -95,7 +95,7 @@ <property name="name"> <cstring>levelUpBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>20</height> @@ -112,7 +112,7 @@ <property name="name"> <cstring>levelDownBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>20</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -171,7 +171,7 @@ <property name="name"> <cstring>speedLCD</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>30</height> @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -291,7 +291,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -321,7 +321,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -337,7 +337,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp index b2e48277..7ed140ca 100644 --- a/ktouch/src/ktouchtrainer.cpp +++ b/ktouch/src/ktouchtrainer.cpp @@ -31,7 +31,7 @@ #include "ktouchdefaults.h" #include "prefs.h" -KTouchTrainer::KTouchTrainer(KTouchtqStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture) +KTouchTrainer::KTouchTrainer(KTouchStatus *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->updatetqStatus(m_level, m_levelStats.correctness()); + m_statusWidget->updateStatus(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->updatetqStatus(m_level, 1); + m_statusWidget->updateStatus(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->updatetqStatus(m_level, m_levelStats.correctness()); + m_statusWidget->updateStatus(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->updatetqStatus(m_level, m_levelStats.correctness() ); + m_statusWidget->updateStatus(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::tqcurrentDateTime(); + m_levelStats.m_timeRecorded = TQDateTime::currentDateTime(); 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::tqcurrentDateTime(); + m_sessionStats.m_timeRecorded = TQDateTime::currentDateTime(); 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::tqcurrentDateTime(); + m_levelStats.m_timeRecorded = TQDateTime::currentDateTime(); 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->updatetqStatus(m_level, 1); + m_statusWidget->updateStatus(m_level, 1); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchtrainer.h b/ktouch/src/ktouchtrainer.h index 4dba8ebc..2a766a64 100644 --- a/ktouch/src/ktouchtrainer.h +++ b/ktouch/src/ktouchtrainer.h @@ -23,7 +23,7 @@ class TQTimer; -class KTouchtqStatus; +class KTouchStatus; class KTouchSlideLine; class KTouchKeyboardWidget; class KTouchLecture; @@ -62,7 +62,7 @@ class KTouchTrainer : public TQObject { TQ_OBJECT public: /// Constructor. - KTouchTrainer(KTouchtqStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture); + KTouchTrainer(KTouchStatus *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). @@ -149,7 +149,7 @@ class KTouchTrainer : public TQObject { /// right before a new level and new line is started). void statsChangeLevel(); - KTouchtqStatus *m_statusWidget; ///< Pointer to the status widget on top of the main window. + KTouchStatus *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 26686a09..79c3ace4 100644 --- a/ktouch/src/ktouchutils.cpp +++ b/ktouch/src/ktouchutils.cpp @@ -10,7 +10,7 @@ * (at your option) any later version. * ***************************************************************************/ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> #include <tqmap.h> @@ -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''").tqarg(mins).tqarg(secs); + return TQString("%1' %2''").arg(mins).arg(secs); } void sort_lists(TQStringList& text, TQStringList& data) { |