diff options
Diffstat (limited to 'ktouch/src')
26 files changed, 89 insertions, 101 deletions
diff --git a/ktouch/src/Makefile.am b/ktouch/src/Makefile.am index f7b33145..5a05aa28 100644 --- a/ktouch/src/Makefile.am +++ b/ktouch/src/Makefile.am @@ -50,7 +50,7 @@ ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \ ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp # the library search path. -ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index e1e3e172..01792d3a 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -29,7 +29,7 @@ #include <kstatusbar.h> #include <tdefiledialog.h> #include <tdeaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kdebug.h> #include <tdepopupmenu.h> @@ -64,7 +64,7 @@ KTouch::KTouch() m_keyboardWidget(NULL), m_trainer(NULL) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setInputMethodEnabled(true); // Set global KTouchPtr to the main KTouch Object @@ -88,7 +88,7 @@ KTouch::KTouch() initTrainingSession(); // If session was restored, the function readProperties() was already called - if (kapp->isRestored()) { + if (tdeApp->isRestored()) { kdDebug() << "[KTouch::KTouch] restoring session..." << endl; /// \todo Rewrite all the session management stuff. /// For now we just do the same as for the standard startup. @@ -374,7 +374,7 @@ void KTouch::fileEditKeyboard() { // ---------------------------------------------------------------------------- void KTouch::fileQuit() { - kapp->quit(); + tdeApp->quit(); } // ---------------------------------------------------------------------------- @@ -431,16 +431,16 @@ void KTouch::optionsPreferences() { dialog->addPage(m_pageKeyboard, i18n("Keyboard Settings"), "keyboard_layout"); m_pageColors = new KTouchPrefColorsLayout(0, "Colors"); dialog->addPage(m_pageColors, i18n("Color Settings"), "applications-graphics"); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(applyPreferences())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(applyPreferences())); // TODO : Connect some other buttons/check boxes of the dialog - connect(m_pageGeneral->kcfg_OverrideLectureFont, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(configOverrideLectureFontToggled(bool))); - connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(configOverrideKeyboardFontToggled(bool))); - connect(m_pageTraining->kcfg_AutoLevelChange, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(configAutoLevelChangeToggled(bool))); - connect(m_pageColors->kcfg_CommonTypingLineColors, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(configCommonColorsToggled(bool))); + connect(m_pageGeneral->kcfg_OverrideLectureFont, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configOverrideLectureFontToggled(bool))); + connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configOverrideKeyboardFontToggled(bool))); + connect(m_pageTraining->kcfg_AutoLevelChange, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configAutoLevelChangeToggled(bool))); + connect(m_pageColors->kcfg_CommonTypingLineColors, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configCommonColorsToggled(bool))); // call the functions to enable/disable controls depending on settings configOverrideLectureFontToggled(Prefs::overrideLectureFont()); configOverrideKeyboardFontToggled(Prefs::overrideKeyboardFont()); @@ -684,40 +684,40 @@ void KTouch::initTrainingSession() { void KTouch::setupActions() { // *** File menu *** new TDEAction(i18n("&Open lecture..."), "open_lecture", 0, - TQT_TQOBJECT(this), TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); + this, TQ_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); new TDEAction(i18n("&Edit lecture..."), "edit_lecture", 0, - TQT_TQOBJECT(this), TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); + this, TQ_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); new TDEAction(i18n("&Edit color scheme..."), "edit_colors", 0, - TQT_TQOBJECT(this), TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); + this, TQ_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); // new TDEAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0, -// TQT_TQOBJECT(this), TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(fileQuit()), actionCollection()); +// this, TQ_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); + KStdAction::quit(this, TQ_SLOT(fileQuit()), actionCollection()); // *** Training menu *** new TDEAction(i18n("&Start New Session"), "launch", 0, - TQT_TQOBJECT(this), TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); + this, TQ_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); m_trainingPause = new TDEAction(i18n("&Pause Session"), "media-playback-pause", 0, - TQT_TQOBJECT(this), TQT_SLOT(trainingPause()), actionCollection(), "training_pause"); + this, TQ_SLOT(trainingPause()), actionCollection(), "training_pause"); new TDEAction(i18n("&Lecture Statistics"), "kalarm", 0, - TQT_TQOBJECT(this), TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats"); + this, TQ_SLOT(trainingStatistics()), actionCollection(), "training_stats"); // Setup menu entries for the training lectures - m_defaultLectureAction = new TDESelectAction(i18n("Default &Lectures"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "default_lectures"); + m_defaultLectureAction = new TDESelectAction(i18n("Default &Lectures"), 0, this, 0, actionCollection(), "default_lectures"); m_defaultLectureAction->setMenuAccelsEnabled(false); m_defaultLectureAction->setItems(m_lectureTitles); m_defaultLectureAction->setCurrentItem(0); - connect (m_defaultLectureAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeLecture(int))); + connect (m_defaultLectureAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeLecture(int))); // *** Settings menu *** - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // Setup menu entries for keyboard layouts - m_keyboardLayoutAction= new TDESelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts"); + m_keyboardLayoutAction= new TDESelectAction(i18n("&Keyboard Layouts"), 0, this, 0, actionCollection(), "keyboard_layouts"); m_keyboardLayoutAction->setMenuAccelsEnabled(false); m_keyboardLayoutAction->setItems(m_keyboardTitles); - connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeKeyboard(int))); + connect (m_keyboardLayoutAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeKeyboard(int))); // Setup menu entries for colour schemes - m_keyboardColorAction = new TDESelectAction(i18n("&Color Schemes"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_schemes"); + m_keyboardColorAction = new TDESelectAction(i18n("&Color Schemes"), 0, this, 0, actionCollection(), "keyboard_schemes"); TQStringList schemes_list; for (unsigned int i=0; i<KTouchColorScheme::m_colorSchemes.count(); ++i) schemes_list.append(KTouchColorScheme::m_colorSchemes[i].m_name); @@ -726,7 +726,7 @@ void KTouch::setupActions() { if (static_cast<unsigned int>(Prefs::currentColorScheme()) >= schemes_list.count()) Prefs::setCurrentColorScheme(1); m_keyboardColorAction->setCurrentItem(Prefs::currentColorScheme()); - connect (m_keyboardColorAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeColor(int))); + connect (m_keyboardColorAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeColor(int))); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h index 7b58b411..85addef3 100644 --- a/ktouch/src/ktouch.h +++ b/ktouch/src/ktouch.h @@ -57,7 +57,7 @@ class KTouchPrefColorsLayout; /// (KTouchTrainer), which will then process it. So the heavy work lies in the trainer /// object and all the widgets. class KTouch : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /// Constructor, creates the KTouch proggy. diff --git a/ktouch/src/ktouchchartwidget.h b/ktouch/src/ktouchchartwidget.h index 87120703..9d40b660 100644 --- a/ktouch/src/ktouchchartwidget.h +++ b/ktouch/src/ktouchchartwidget.h @@ -23,7 +23,7 @@ class KTouchTrainer; /// This is the chart widget and contains all chart drawing code. class KTouchChartWidget : public KPlotWidget { - Q_OBJECT + TQ_OBJECT public: /// Constructor. diff --git a/ktouch/src/ktouchcoloreditor.h b/ktouch/src/ktouchcoloreditor.h index dfd77cf6..731eb57a 100644 --- a/ktouch/src/ktouchcoloreditor.h +++ b/ktouch/src/ktouchcoloreditor.h @@ -26,12 +26,12 @@ /// Implementation of the KTouch Color Scheme Editor. class KTouchColorEditor : public KTouchColorEditorDlg { - Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchColorEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchColorEditor(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /// Destructor ~KTouchColorEditor(); diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui index 5f1918c3..c5554ee1 100644 --- a/ktouch/src/ktouchcoloreditor_dlg.ui +++ b/ktouch/src/ktouchcoloreditor_dlg.ui @@ -785,13 +785,13 @@ <slot>updateClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>closeQuery()</slot> <slot>addBtnClicked()</slot> <slot>removeBtnClicked()</slot> <slot>updateClicked()</slot> <slot>colorSchemeChanged(TQListBoxItem * item)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/ktouch/src/ktouchkeyboardeditor.h b/ktouch/src/ktouchkeyboardeditor.h index 6ba58f67..f473ab2d 100644 --- a/ktouch/src/ktouchkeyboardeditor.h +++ b/ktouch/src/ktouchkeyboardeditor.h @@ -40,12 +40,12 @@ /// @endcode /// @see startEditor() for details on the return value. class KTouchKeyboardEditor : public KTouchKeyboardEditorDlg { - Q_OBJECT + TQ_OBJECT public: /// Constructor. - KTouchKeyboardEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchKeyboardEditor(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /// Default destructor. ~KTouchKeyboardEditor() {} /// Shows and executes the dialog (argument is the url to the default or diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui index 741f4e20..919673d1 100644 --- a/ktouch/src/ktouchkeyboardeditor_dlg.ui +++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui @@ -378,7 +378,7 @@ <slot>keySelectionChanged(TQListBoxItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>openBtnClicked()</slot> <slot>saveBtnClicked()</slot> <slot>saveAsBtnClicked()</slot> @@ -388,7 +388,7 @@ <slot>editBtnClicked()</slot> <slot>removeBtnClicked()</slot> <slot>keySelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index 9b29233e..bf13c0e7 100644 --- a/ktouch/src/ktouchkeyboardwidget.cpp +++ b/ktouch/src/ktouchkeyboardwidget.cpp @@ -22,7 +22,7 @@ #include <tdetempfile.h> #include <tdelocale.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include "prefs.h" diff --git a/ktouch/src/ktouchkeyboardwidget.h b/ktouch/src/ktouchkeyboardwidget.h index 8888e27b..a629e44c 100644 --- a/ktouch/src/ktouchkeyboardwidget.h +++ b/ktouch/src/ktouchkeyboardwidget.h @@ -40,7 +40,7 @@ class KURL; * activated keys and finger key animations etc.) */ class KTouchKeyboardWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /// Constructor diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index 513a740a..66f6aead 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -46,18 +46,18 @@ KTouchLectureEditor::KTouchLectureEditor(TQWidget *parent, const char* name, boo { levelListView->setSorting(-1); // don't sort my level list view! - connect(levelListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),this, TQT_SLOT(newSelection(TQListViewItem*)) ); - connect(newCharsEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(newCharsChanged(const TQString&)) ); - connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newLevel()) ); - connect(deleteBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLevel()) ); - connect(upBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp()) ); - connect(downBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown()) ); + connect(levelListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),this, TQ_SLOT(newSelection(TQListViewItem*)) ); + connect(newCharsEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(newCharsChanged(const TQString&)) ); + connect(newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(newLevel()) ); + connect(deleteBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteLevel()) ); + connect(upBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUp()) ); + connect(downBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDown()) ); // make the connections for making the lecture modified - connect(titleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(setModified()) ); - connect(lectureCommentEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setModified()) ); - connect(levelCommentEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(setModified()) ); - connect(linesTextEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setModified()) ); + connect(titleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(setModified()) ); + connect(lectureCommentEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setModified()) ); + connect(levelCommentEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(setModified()) ); + connect(linesTextEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setModified()) ); // The font, open, save, saveas and close buttons are already connected } diff --git a/ktouch/src/ktouchlectureeditor.h b/ktouch/src/ktouchlectureeditor.h index 4b2e44c8..972357e6 100644 --- a/ktouch/src/ktouchlectureeditor.h +++ b/ktouch/src/ktouchlectureeditor.h @@ -40,11 +40,11 @@ /// @endcode /// @see startEditor() for details on the return value. class KTouchLectureEditor : public KTouchLectureEditorDlg { - Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchLectureEditor(TQWidget *parent, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KTouchLectureEditor(TQWidget *parent, const char* name = 0, bool modal = false, WFlags fl = 0); /// Destructor ~KTouchLectureEditor() {} /// Shows and executes the dialog (argument is the url to the default or diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui index d5f0f888..f2624444 100644 --- a/ktouch/src/ktouchlectureeditor_dlg.ui +++ b/ktouch/src/ktouchlectureeditor_dlg.ui @@ -524,9 +524,6 @@ <property name="text"> <string>&Open...</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -535,9 +532,6 @@ <property name="text"> <string>&Save</string> </property> - <property name="accel"> - <string></string> - </property> <property name="default"> <bool>true</bool> </property> @@ -549,9 +543,6 @@ <property name="text"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -560,9 +551,6 @@ <property name="text"> <string>&Close</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </hbox> </widget> @@ -656,14 +644,14 @@ <tabstop>saveAsButton</tabstop> <tabstop>quitButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>openBtnClicked()</slot> <slot>saveBtnClicked()</slot> <slot>saveAsBtnClicked()</slot> <slot>closeQuery()</slot> <slot>setModified()</slot> <slot>fontBtnClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/ktouch/src/ktouchopenrequest.h b/ktouch/src/ktouchopenrequest.h index ee8b3bdb..849c157a 100644 --- a/ktouch/src/ktouchopenrequest.h +++ b/ktouch/src/ktouchopenrequest.h @@ -51,12 +51,12 @@ /// the user). /// class KTouchOpenRequest : public KTouchOpenRequestDlg { - Q_OBJECT + TQ_OBJECT public: /// Default constructor. - KTouchOpenRequest(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchOpenRequest(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /// Default destructor. ~KTouchOpenRequest() {} /// Sets up the dialog and runs it. diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui index 410353dc..46746f28 100644 --- a/ktouch/src/ktouchopenrequest_dlg.ui +++ b/ktouch/src/ktouchopenrequest_dlg.ui @@ -273,11 +273,11 @@ <tabstop>okBtn</tabstop> <tabstop>cancelBtn</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>okBtnClicked()</slot> <slot>radioBtnChanged()</slot> <slot>browseBtnClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui index 75cef9e1..ad0f7db7 100644 --- a/ktouch/src/ktouchprefkeyboardlayout.ui +++ b/ktouch/src/ktouchprefkeyboardlayout.ui @@ -132,9 +132,9 @@ </widget> <customwidgets> </customwidgets> -<Q_SLOTS> +<slots> <slot>fontChooseBtnClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdefontrequester.h</include> diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp index d7eff3fd..366fbd77 100644 --- a/ktouch/src/ktouchslideline.cpp +++ b/ktouch/src/ktouchslideline.cpp @@ -77,8 +77,8 @@ KTouchSlideLine::KTouchSlideLine(TQWidget *parent) m_xFrameStudent = 0; m_xFrameStudentCurrent = 0; - connect( &m_cursorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(toggleCursor()) ); - connect( &m_slideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slide()) ); + connect( &m_cursorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(toggleCursor()) ); + connect( &m_slideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slide()) ); } // ---------------------------------------------------------------------------- @@ -411,7 +411,7 @@ void KTouchSlideLine::updateSlidingLines() { // draw the teacher pixmap text TQPainter painter; - painter.begin (TQT_TQPAINTDEVICE(m_teacherPixmap), this); + painter.begin (m_teacherPixmap, this); painter.setFont( m_font ); TQColor col_tt = Prefs::commonTypingLineColors() ? @@ -532,7 +532,7 @@ void KTouchSlideLine::updateStudentLine() { // now let's draw the students pixmap TQPainter painter; - painter.begin (TQT_TQPAINTDEVICE(m_studentPixmap), this); + painter.begin (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 2f8178c4..97c1e51e 100644 --- a/ktouch/src/ktouchslideline.h +++ b/ktouch/src/ktouchslideline.h @@ -32,7 +32,7 @@ class TQPainter; /// /// Please refer to the documentation 'sliding_line_widget.pdf' in the doc folder. class KTouchSlideLine : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /// Constructor @@ -121,8 +121,8 @@ class KTouchSlideLine : public TQWidget { TQColor m_cursorBackground; ///< Defines the background colour of the cursor (when turned off). // variables depending on size of widget, will be updated in resizeEvent() - int m_marginVerWidget; ///<Qt::Vertical margin between widget boundary and sliding line in pixels. - int m_slideLineDist; ///<Qt::Vertical distance between sliding lines in pixels. + int m_marginVerWidget; ///< Vertical margin between widget boundary and sliding line in pixels. + int m_slideLineDist; ///< Vertical distance between sliding lines in pixels. int m_slideLineHeight; ///< Height of a sliding line in pixels. int m_marginCursor; ///< The margin for cursor movement (minimum distance from left and right ends of slide line boundaries). @@ -133,7 +133,7 @@ class KTouchSlideLine : public TQWidget { int m_yCursorStudent; ///< Cursor top y coordinate (from top of visible area) in the student line. // newly defined variables, will be updated on the setNewText() and partially in setStudentText() - int m_marginHorWidget; ///<Qt::Horizontal margin between widget boundary and sliding line in pixels. + int m_marginHorWidget; ///< Horizontal margin between widget boundary and sliding line in pixels. int m_slideLineWidth; ///< The length of the sliding line in pixels. int m_cursorRangeLen; ///< Length (in pixel) that the cursor can move between left and right margin. diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp index 0cfdeb2e..488ab6b0 100644 --- a/ktouch/src/ktouchstatistics.cpp +++ b/ktouch/src/ktouchstatistics.cpp @@ -40,13 +40,13 @@ KTouchStatistics::KTouchStatistics(TQWidget* parent) sessionsRadio->setChecked(true); WPMRadio->setChecked(true); eventRadio->setChecked(true); - connect(closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect(lectureCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(lectureActivated(int)) ); - connect(clearButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearHistory()) ); + connect(closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect(lectureCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(lectureActivated(int)) ); + connect(clearButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearHistory()) ); // connect the radio buttons with the chart update function - connect(buttonGroup1, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) ); - connect(buttonGroup2, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) ); - connect(buttonGroup3, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) ); + connect(buttonGroup1, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) ); + connect(buttonGroup2, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) ); + connect(buttonGroup3, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) ); // TODO : temporarily remove detailed stats page and deactivate options levelsRadio->setEnabled(false); diff --git a/ktouch/src/ktouchstatistics.h b/ktouch/src/ktouchstatistics.h index ae136dd6..5adce58e 100644 --- a/ktouch/src/ktouchstatistics.h +++ b/ktouch/src/ktouchstatistics.h @@ -26,7 +26,7 @@ class KURL; /// Implementation of the statistics widget class KTouchStatistics : public KTouchStatisticsDlg { - Q_OBJECT + TQ_OBJECT public: /// Constructor, takes a pointer to the trainer object. diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index 6bf98716..cf7c723b 100644 --- a/ktouch/src/ktouchstatisticsdata.cpp +++ b/ktouch/src/ktouchstatisticsdata.cpp @@ -94,7 +94,7 @@ bool KTouchLevelStats::read(TQDomNode in) { if (!n.isNull()) { TQString timestring = n.firstChild().nodeValue(); if (timestring != TQString()) - m_timeRecorded = TQDateTime::fromString(timestring, Qt::ISODate); + m_timeRecorded = TQDateTime::fromString(timestring, TQt::ISODate); } // read characters n = in.namedItem("CharStats"); @@ -121,7 +121,7 @@ void KTouchLevelStats::write(TQDomDocument& doc, TQDomElement& root) const { level.setAttribute("Words", m_words); // add time TQDomElement e = doc.createElement("Time"); - TQDomText tn = doc.createTextNode(m_timeRecorded.toString(Qt::ISODate)); + TQDomText tn = doc.createTextNode(m_timeRecorded.toString(TQt::ISODate)); e.appendChild(tn); level.appendChild(e); // add char stats @@ -236,7 +236,7 @@ bool KTouchSessionStats::read(TQDomNode in) { if (!n.isNull()) { TQString timestring = n.firstChild().nodeValue(); if (timestring != TQString()) - m_timeRecorded = TQDateTime::fromString(timestring, Qt::ISODate); + m_timeRecorded = TQDateTime::fromString(timestring, TQt::ISODate); } // read level numbers n = in.namedItem("LevelNums"); @@ -272,7 +272,7 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const { session.setAttribute("Words", m_words); // add time TQDomElement e = doc.createElement("Time"); - TQDomText tn = doc.createTextNode(m_timeRecorded.toString(Qt::ISODate)); + TQDomText tn = doc.createTextNode(m_timeRecorded.toString(TQt::ISODate)); e.appendChild(tn); session.appendChild(e); // add levels diff --git a/ktouch/src/ktouchstatus.h b/ktouch/src/ktouchstatus.h index 00a95d77..a01c1e4e 100644 --- a/ktouch/src/ktouchstatus.h +++ b/ktouch/src/ktouchstatus.h @@ -26,7 +26,7 @@ * The "new characters" string is set using the member function setNewChars(). */ class KTouchStatus : public KTouchStatusLayout { - Q_OBJECT + TQ_OBJECT public: /// Constructor diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui index b2625d23..d17fc8db 100644 --- a/ktouch/src/ktouchstatuslayout.ui +++ b/ktouch/src/ktouchstatuslayout.ui @@ -348,13 +348,13 @@ </widget> </hbox> </widget> -<Q_SLOTS> +<slots> <slot>levelForcedDown()</slot> <slot>levelForcedUp()</slot> <slot>showStatChanged(int)</slot> <slot>runningStateChanged(int)</slot> <slot>startKTouch()</slot> <slot>stopKTouch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp index 568e25c5..412c53e4 100644 --- a/ktouch/src/ktouchtrainer.cpp +++ b/ktouch/src/ktouchtrainer.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <kpushbutton.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kaudioplayer.h> #include <tqmessagebox.h> @@ -55,9 +55,9 @@ KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, K m_levelDownSound = TDEGlobal::dirs()->findResource("appdata","down.wav"); m_typeWriterSound = TDEGlobal::dirs()->findResource("appdata","typewriter.wav"); - connect(m_statusWidget->levelUpBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelUp()) ); - connect(m_statusWidget->levelDownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelDown()) ); - connect(m_trainingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerTick()) ); + connect(m_statusWidget->levelUpBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(levelUp()) ); + connect(m_statusWidget->levelDownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(levelDown()) ); + connect(m_trainingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerTick()) ); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchtrainer.h b/ktouch/src/ktouchtrainer.h index 009594b8..fd4c516d 100644 --- a/ktouch/src/ktouchtrainer.h +++ b/ktouch/src/ktouchtrainer.h @@ -58,7 +58,7 @@ class KTouchLecture; /// and the statusbar of the main window). In this member function also the word count of the current line /// is updated. class KTouchTrainer : public TQObject { - Q_OBJECT + TQ_OBJECT public: /// Constructor. diff --git a/ktouch/src/main.cpp b/ktouch/src/main.cpp index cebc0a0d..0e5ad898 100644 --- a/ktouch/src/main.cpp +++ b/ktouch/src/main.cpp @@ -61,7 +61,7 @@ int main(int argc, char **argv) splash.setHideEnabled( true ); // allow user to click the splash screen away splash.show(); // show it TQTimer splashTimer; - splashTimer.connect(&splashTimer, TQT_SIGNAL(timeout()), &splash, TQT_SLOT(hide())); + splashTimer.connect(&splashTimer, TQ_SIGNAL(timeout()), &splash, TQ_SLOT(hide())); splashTimer.start(2000, true); // start singleshot timer to hide the splashscreen */ |