diff options
Diffstat (limited to 'kvoctrain/kvoctrain/entry-dialogs')
25 files changed, 222 insertions, 213 deletions
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp index 0bdae252..29380370 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp @@ -32,8 +32,8 @@ #include <tqlineedit.h> -AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent, const char *name) - : AdjEntryPageForm( parent, name ), dlgbook(_dlgbook) +AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *tqparent, const char *name) + : AdjEntryPageForm( tqparent, name ), dlgbook(_dlgbook) { comparisons = comp; diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h index efbae74f..3750fb3c 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h @@ -35,9 +35,10 @@ class EntryDlg; class AdjEntryPage : public AdjEntryPageForm { Q_OBJECT + TQ_OBJECT public: - AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent = NULL, const char *name = NULL); + AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *tqparent = NULL, const char *name = NULL); void setData (bool multi_sel, const Comparison &comp); diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui index a2213edb..4005b0c6 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AdjEntryPageForm</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AdjEntryPageForm</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -42,7 +42,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lev1Label</cstring> </property> @@ -61,7 +61,7 @@ <cstring>lev1Field</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lev2Label</cstring> </property> @@ -80,7 +80,7 @@ <cstring>lev2Field</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lev3Label</cstring> </property> @@ -99,7 +99,7 @@ <cstring>lev3Field</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lev1Field</cstring> </property> @@ -112,7 +112,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lev2Field</cstring> </property> @@ -125,7 +125,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lev3Field</cstring> </property> @@ -142,5 +142,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp index 87e0fe59..a42e5d01 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp @@ -41,10 +41,10 @@ AuxInfoEntryPage::AuxInfoEntryPage TQString exam, TQString rem, TQString para, - TQWidget *parent, + TQWidget *tqparent, const char *name ) - : AuxInfoEntryPageForm( parent, name ), dlgbook(_dlgbook) + : AuxInfoEntryPageForm( tqparent, name ), dlgbook(_dlgbook) { TQFontMetrics fm (synonym_line->font()); diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h index e8e88535..59a62c28 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h @@ -33,6 +33,7 @@ class EntryDlg; class AuxInfoEntryPage : public AuxInfoEntryPageForm { Q_OBJECT + TQ_OBJECT public: AuxInfoEntryPage @@ -44,7 +45,7 @@ public: TQString example, TQString remark, TQString para, - TQWidget *parent = 0, + TQWidget *tqparent = 0, const char *name = 0 ); diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui index 632973bc..c936e8ce 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AuxInfoEntryPageForm</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AuxInfoEntryPageForm</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -58,7 +58,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QMultiLineEdit" row="2" column="1"> + <widget class="TQMultiLineEdit" row="2" column="1"> <property name="name"> <cstring>examp_line</cstring> </property> @@ -70,14 +70,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>80</height> </size> </property> </widget> - <widget class="QMultiLineEdit" row="3" column="1"> + <widget class="TQMultiLineEdit" row="3" column="1"> <property name="name"> <cstring>remark_line</cstring> </property> @@ -89,14 +89,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>80</height> </size> </property> </widget> - <widget class="QMultiLineEdit" row="4" column="1"> + <widget class="TQMultiLineEdit" row="4" column="1"> <property name="name"> <cstring>para_line</cstring> </property> @@ -108,14 +108,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>80</height> </size> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>synonym_label</cstring> </property> @@ -126,7 +126,7 @@ <cstring>synonym_line</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>antonym_label</cstring> </property> @@ -137,7 +137,7 @@ <cstring>antonym_line</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>examp_label</cstring> </property> @@ -148,7 +148,7 @@ <cstring>examp_line</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>remark_label</cstring> </property> @@ -159,7 +159,7 @@ <cstring>remark_line</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>para_label</cstring> </property> @@ -170,7 +170,7 @@ <cstring>para_line</cstring> </property> </widget> - <widget class="QMultiLineEdit" row="0" column="1"> + <widget class="TQMultiLineEdit" row="0" column="1"> <property name="name"> <cstring>synonym_line</cstring> </property> @@ -182,7 +182,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>80</height> @@ -195,7 +195,7 @@ <string></string> </property> </widget> - <widget class="QMultiLineEdit" row="1" column="1"> + <widget class="TQMultiLineEdit" row="1" column="1"> <property name="name"> <cstring>antonym_line</cstring> </property> @@ -207,7 +207,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>80</height> @@ -225,5 +225,5 @@ <tabstop>remark_line</tabstop> <tabstop>para_line</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp index 9a7d44fb..6b4e8ea6 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp @@ -63,11 +63,11 @@ CommonEntryPage::CommonEntryPage QueryManager &_querymanager, bool active, const TQFont& _ipafont, - TQWidget *parent, + TQWidget *tqparent, const char *name ) : - CommonEntryPageForm( parent, name ), + CommonEntryPageForm( tqparent, name ), pronunce(pron), expression(expr), usageCollection (act_usage), @@ -177,13 +177,13 @@ void CommonEntryPage::setTypeBox(const TQString &act_type) all_types = QueryManager::getRelation(false); all_maintypes = QueryManager::getRelation(true); - TQString s = QueryManager::getMainType(act_type)+QM_TYPE_DIV; + TQString s = QueryManager::getMainType(act_type)+TQM_TYPE_DIV; int curr_type = 0; type_box->clear(); type_box->insertItem (i18n("<none>")); for (int i = 0; i < (int) all_maintypes.size(); i++) { type_box->insertItem (all_maintypes[i].longStr()); - if (s == all_maintypes[i].shortStr()+QM_TYPE_DIV) + if (s == all_maintypes[i].shortStr()+TQM_TYPE_DIV) curr_type = i+1; } type_box->setCurrentItem(curr_type); @@ -208,7 +208,7 @@ void CommonEntryPage::setUsageBox(const TQString & act_usage) usage_box->clear(); for (int i = 0; i < (int) usages.size(); i++) { usage_box->insertItem (usages[i].longStr()); - if (UsageManager::contains(TQString(usages[i].identStr()), act_usage)) { + if (UsageManager::tqcontains(TQString(usages[i].identStr()), act_usage)) { usage_box->setSelected (i, true); } } @@ -293,7 +293,7 @@ void CommonEntryPage::slotTypeSelected(int idx) else { type = all_maintypes[idx-1].shortStr(); emit typeSelected(type); - TQString main_patt = all_maintypes[idx-1].shortStr()+QM_TYPE_DIV; + TQString main_patt = all_maintypes[idx-1].shortStr()+TQM_TYPE_DIV; int sub_idx; if ( idx-1 < (int) all_types.size() ){ for (sub_idx = 0; sub_idx < (int) all_types.size(); sub_idx++) { diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h index 9d3652d2..b20d59ce 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h @@ -37,6 +37,7 @@ class EntryDlg; class CommonEntryPage : public CommonEntryPageForm { Q_OBJECT + TQ_OBJECT public: CommonEntryPage @@ -55,7 +56,7 @@ public: QueryManager &querymanager, bool active, const TQFont& ipafont, - TQWidget* parent = NULL, + TQWidget* tqparent = NULL, const char* name = NULL ); diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui index 5e67f8a4..11c06fe1 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CommonEntryPageForm</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CommonEntryPageForm</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -36,7 +36,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>asdf</cstring> </property> @@ -61,7 +61,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame4</cstring> </property> @@ -81,7 +81,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>expr_line</cstring> </property> @@ -94,7 +94,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>pronunce_line</cstring> </property> @@ -107,7 +107,7 @@ </sizepolicy> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>lesson_box</cstring> </property> @@ -120,7 +120,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>expr_label</cstring> </property> @@ -131,7 +131,7 @@ <cstring>expr_line</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>pronunce_label</cstring> </property> @@ -142,7 +142,7 @@ <cstring>pronunce_line</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lesson_label</cstring> </property> @@ -153,7 +153,7 @@ <cstring>lesson_box</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>b_LessDlg</cstring> </property> @@ -165,13 +165,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>30</height> @@ -184,7 +184,7 @@ <string>Invokes input dialog for lessons</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>b_pronDlg</cstring> </property> @@ -196,13 +196,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>30</height> @@ -217,7 +217,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>type_label</cstring> </property> @@ -234,7 +234,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>type_box</cstring> </property> @@ -257,14 +257,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>subtype_label</cstring> </property> @@ -275,7 +275,7 @@ <cstring>subtype_box</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>subtype_box</cstring> </property> @@ -288,7 +288,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>b_TypeDlg</cstring> </property> @@ -300,13 +300,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>30</height> @@ -321,7 +321,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>usage_label</cstring> </property> @@ -346,7 +346,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>b_usageDlg</cstring> </property> @@ -358,13 +358,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>24</height> @@ -387,14 +387,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QListBox" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQListBox" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>usage_box</cstring> </property> @@ -406,7 +406,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>90</height> @@ -416,7 +416,7 @@ <enum>Multi</enum> </property> </widget> - <widget class="QLabel" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>usage_line</cstring> </property> @@ -428,7 +428,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>80</height> @@ -440,7 +440,7 @@ <property name="frameShadow"> <enum>Sunken</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -450,7 +450,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>c_active</cstring> </property> @@ -475,5 +475,5 @@ <tabstop>b_usageDlg</tabstop> <tabstop>c_active</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp index c0b249aa..4de1b843 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp @@ -73,14 +73,14 @@ EntryDlg::EntryDlg( const TQString &title, bool active, const TQFont& ipafont, - TQWidget *parent, + TQWidget *tqparent, const char *name, bool modal) : - KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, parent, name, modal, false, + KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, tqparent, name, modal, false, KGuiItem(i18n("&Reset")), - KGuiItem(TQString::null, "view_left_right"), - KGuiItem(TQString::null, "view_top_bottom")) + KGuiItem(TQString(), "view_left_right"), + KGuiItem(TQString(), "view_top_bottom")) { mainwin = main; @@ -105,7 +105,7 @@ EntryDlg::EntryDlg( topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); comm_page = new CommonEntryPage (this, doc, multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel, - i18n("Original &expression in %1:").arg(s), querymanager, active, + i18n("Original &expression in %1:").tqarg(s), querymanager, active, ipafont, page, name); topLayout->addWidget(comm_page); @@ -135,7 +135,7 @@ EntryDlg::EntryDlg( topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); comm_page = new CommonEntryPage (this, doc, multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel, - i18n("Translated &expression in %1:").arg(s), querymanager, active, + i18n("Translated &expression in %1:").tqarg(s), querymanager, active, ipafont, page, name); topLayout->addWidget(comm_page); @@ -246,10 +246,10 @@ void EntryDlg::setData( if (origin) comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel, - i18n("Original &expression in %1:").arg(s), querymanager, active); + i18n("Original &expression in %1:").tqarg(s), querymanager, active); else comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel, - i18n("Translated &expression in %1:").arg(s), querymanager, active); + i18n("Translated &expression in %1:").tqarg(s), querymanager, active); adj_page->setData(multi_sel, comp); aux_page->setData(multi_sel, synonym, antonym, example, rem, paraphrase); @@ -269,16 +269,16 @@ void EntryDlg::updatePages(const TQString &type) { TQString main; int pos; - if ((pos = type.find (QM_TYPE_DIV)) < 0) // only use main type + if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0) // only use main type main = type; else main = type.left(pos); - if (main == QM_VERB) { + if (main == TQM_VERB) { tense_page->setEnabled(EntryDlg::EnableAll); adj_page->setEnabled(EntryDlg::EnableNone); } - else if (main == QM_ADJ) { + else if (main == TQM_ADJ) { tense_page->setEnabled(EntryDlg::EnableNone); adj_page->setEnabled(EntryDlg::EnableAll); } @@ -311,7 +311,7 @@ void EntryDlg::setEnabled(int enable) TQString type = comm_page->getType(); TQString main; int pos; - if ((pos = type.find (QM_TYPE_DIV)) < 0) // only use main type + if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0) // only use main type main = type; else main = type.left(pos); @@ -321,9 +321,9 @@ void EntryDlg::setEnabled(int enable) comm_page->setEnabled(EnableAll); aux_page->setEnabled(EnableAll); mc_page->setEnabled(EnableAll); - tense_page->setEnabled(main == QM_VERB ? EnableAll : EnableNone); + tense_page->setEnabled(main == TQM_VERB ? EnableAll : EnableNone); mc_page->setEnabled(EnableAll); - adj_page->setEnabled(main == QM_ADJ ? EnableAll : EnableNone); + adj_page->setEnabled(main == TQM_ADJ ? EnableAll : EnableNone); if (from_page != 0) from_page->setEnabled(EnableNone); if (to_page != 0) @@ -334,9 +334,9 @@ void EntryDlg::setEnabled(int enable) comm_page->setEnabled(enable); aux_page->setEnabled(enable); mc_page->setEnabled(enable); - tense_page->setEnabled(main == QM_VERB ? enable : EnableNone); + tense_page->setEnabled(main == TQM_VERB ? enable : EnableNone); mc_page->setEnabled(enable); - adj_page->setEnabled(main == QM_ADJ ? enable : EnableNone); + adj_page->setEnabled(main == TQM_ADJ ? enable : EnableNone); if (from_page != 0) from_page->setEnabled(enable); if (to_page != 0) diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h index 9850e107..04af7e7a 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h @@ -45,6 +45,7 @@ class kvoctrainDoc; class EntryDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: @@ -89,7 +90,7 @@ public: const TQString &title, bool active, const TQFont& ipafont, - TQWidget *parent = 0, + TQWidget *tqparent = 0, const char *name = 0, bool modal = false ); @@ -135,24 +136,24 @@ public: bool fromDateDirty () const { return from_page ? from_page->dateDirty() : false; } bool fromGradeDirty () const { return from_page ? from_page->gradeDirty() : false; } bool fromBCountDirty () const { return from_page ? from_page->bCountDirty() : false; } - bool fromQCountDirty () const { return from_page ? from_page->qCountDirty() : false; } + bool fromTQCountDirty () const { return from_page ? from_page->tqCountDirty() : false; } TQString getFromFauxAmi () const { return from_page ? from_page->getFauxAmi() : TQString(""); } time_t getFromDate () const { return from_page ? from_page->getDate() : 0; } grade_t getFromGrade () const { return from_page ? from_page->getGrade() : KV_NORM_GRADE; } count_t getFromBCount () const { return from_page ? from_page->getBCount() : 0; } - count_t getFromQCount () const { return from_page ? from_page->getQCount() : 0; } + count_t getFromTQCount () const { return from_page ? from_page->getTQCount() : 0; } bool toDateDirty () const { return to_page ? to_page->dateDirty() : false; } bool toGradeDirty () const { return to_page ? to_page->gradeDirty() : false; } bool toBCountDirty () const { return to_page ? to_page->bCountDirty() : false; } - bool toQCountDirty () const { return to_page ? to_page->qCountDirty() : false; } + bool toTQCountDirty () const { return to_page ? to_page->tqCountDirty() : false; } TQString getToFauxAmi () const { return to_page ? to_page->getFauxAmi() : TQString(""); } time_t getToDate () const { return to_page ? to_page->getDate() : 0; } grade_t getToGrade () const { return to_page ? to_page->getGrade() : KV_NORM_GRADE; } count_t getToBCount () const { return to_page ? to_page->getBCount() : 0; } - count_t getToQCount () const { return to_page ? to_page->getQCount() : 0; } + count_t getToTQCount () const { return to_page ? to_page->getTQCount() : 0; } bool lessonDirty () const { return comm_page->lessonDirty(); } bool usageDirty () const { return comm_page->usageDirty(); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp index 0a8bd0cb..75018f70 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp @@ -54,11 +54,11 @@ FromToEntryPage::FromToEntryPage count_t _bcount, TQString faux, TQString label, - TQWidget *parent, + TQWidget *tqparent, const char *name ) : - FromToEntryPageForm( parent, name ), fauxami(faux), dlgbook(_dlgbook) + FromToEntryPageForm( tqparent, name ), fauxami(faux), dlgbook(_dlgbook) { monthnames.clear(); monthnames.append (""); @@ -76,7 +76,7 @@ FromToEntryPage::FromToEntryPage monthnames.append (i18n("December")); connect( bcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotBCount(const TQString&)) ); - connect( qcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotQCount(const TQString&)) ); + connect( qcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTQCount(const TQString&)) ); connect( fauxami_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFauxAmiSelected(const TQString&)) ); connect( never, TQT_SIGNAL(clicked()), TQT_SLOT(slotNever()) ); @@ -137,9 +137,9 @@ void FromToEntryPage::setData( day_spin->setValue(day); month_spin->setValue(month); year_spin->setValue(year); - year_spin->setSpecial(TQString::null); - month_spin->setSpecial(TQString::null); - day_spin->setSpecial(TQString::null); + year_spin->setSpecial(TQString()); + month_spin->setSpecial(TQString()); + day_spin->setSpecial(TQString()); } else { dt.setTime_t (time(0L)); @@ -200,7 +200,7 @@ void FromToEntryPage::slotGradeSelected (int g) } -void FromToEntryPage::slotQCount(const TQString& s) +void FromToEntryPage::slotTQCount(const TQString& s) { setModified(true); qcount_dirty = true; @@ -249,7 +249,7 @@ void FromToEntryPage::slotYearChanged(int new_year) new_year = year; } - year_spin->setSpecial(TQString::null); + year_spin->setSpecial(TQString()); year = new_year; validate(); @@ -278,7 +278,7 @@ void FromToEntryPage::slotMonthChanged(int new_month) new_month = month; } - month_spin->setSpecial(TQString::null); + month_spin->setSpecial(TQString()); month = new_month; validate(); @@ -306,7 +306,7 @@ void FromToEntryPage::slotDayChanged(int new_day) new_day = day; } - day_spin->setSpecial(TQString::null); + day_spin->setSpecial(TQString()); day = new_day; validate(); @@ -339,9 +339,9 @@ void FromToEntryPage::slotToday() day_spin->setValue(day); month_spin->setValue(month); year_spin->setValue(year); - year_spin->setSpecial(TQString::null); - month_spin->setSpecial(TQString::null); - day_spin->setSpecial(TQString::null); + year_spin->setSpecial(TQString()); + month_spin->setSpecial(TQString()); + day_spin->setSpecial(TQString()); validate(); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h index 238f4462..16a1980c 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h @@ -38,6 +38,7 @@ class EntryDlg; class FromToEntryPage : public FromToEntryPageForm { Q_OBJECT + TQ_OBJECT public: @@ -51,7 +52,7 @@ public: count_t _bcount, TQString faux, TQString label, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL ); @@ -66,12 +67,12 @@ public: time_t dateDirty () const { return date_dirty; } grade_t gradeDirty () const { return grade_dirty; } - count_t qCountDirty () const { return qcount_dirty; } + count_t tqCountDirty () const { return qcount_dirty; } count_t bCountDirty () const { return bcount_dirty; } time_t getDate () const; grade_t getGrade () const { return grade; } - count_t getQCount () const { return qcount; } + count_t getTQCount () const { return qcount; } count_t getBCount () const { return bcount; } TQString getFauxAmi () const { return fauxami; } @@ -85,7 +86,7 @@ signals: protected slots: void slotGradeSelected(int); - void slotQCount(const TQString&); + void slotTQCount(const TQString&); void slotBCount(const TQString&); void slotIncYear(); diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui index 9fea8f70..48e4db86 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>FromToEntryPageForm</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FromToEntryPageForm</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>direc_label</cstring> </property> @@ -42,7 +42,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame3</cstring> </property> @@ -72,14 +72,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>gradebox</cstring> </property> @@ -92,7 +92,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>fauxami_line</cstring> </property> @@ -105,7 +105,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>fauxami_label</cstring> </property> @@ -116,7 +116,7 @@ <cstring>fauxami_line</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>grade_label</cstring> </property> @@ -129,7 +129,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -150,7 +150,7 @@ <property name="name"> <cstring>year_spin</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>60</width> <height>0</height> @@ -161,7 +161,7 @@ <property name="name"> <cstring>month_spin</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>110</width> <height>0</height> @@ -172,7 +172,7 @@ <property name="name"> <cstring>day_spin</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>60</width> <height>0</height> @@ -189,14 +189,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>today</cstring> </property> @@ -204,7 +204,7 @@ <string>T&oday</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>never</cstring> </property> @@ -214,7 +214,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -231,7 +231,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>bcount_label</cstring> </property> @@ -242,7 +242,7 @@ <cstring>bcount_line</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>qcount_label</cstring> </property> @@ -253,7 +253,7 @@ <cstring>qcount_line</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>qcount_line</cstring> </property> @@ -266,7 +266,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>bcount_line</cstring> </property> @@ -316,5 +316,5 @@ <tabstop>qcount_line</tabstop> <tabstop>bcount_line</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp index a6967704..c58448c4 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp @@ -32,8 +32,8 @@ #include <tqlineedit.h> -MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent, const char *name) - : MCEntryPageForm( parent, name ), dlgbook(_dlgbook) +MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *tqparent, const char *name) + : MCEntryPageForm( tqparent, name ), dlgbook(_dlgbook) { multiplechoice = mc; diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h index c2938814..78aa4fc8 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h @@ -35,9 +35,10 @@ class EntryDlg; class MCEntryPage : public MCEntryPageForm { Q_OBJECT + TQ_OBJECT public: - MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent = NULL, const char *name = NULL); + MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *tqparent = NULL, const char *name = NULL); void setData(bool multi_sel, const MultipleChoice &mc); diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui index b03b2de6..1bb29a55 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MCEntryPageForm</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MCEntryPageForm</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -42,7 +42,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>mc1Label</cstring> </property> @@ -61,7 +61,7 @@ <cstring>mc1Field</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mc2Label</cstring> </property> @@ -80,7 +80,7 @@ <cstring>mc2Field</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>mc3Label</cstring> </property> @@ -99,7 +99,7 @@ <cstring>mc3Field</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>mc1Field</cstring> </property> @@ -112,7 +112,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>mc2Field</cstring> </property> @@ -125,7 +125,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>mc3Field</cstring> </property> @@ -138,7 +138,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>mc5Field</cstring> </property> @@ -151,7 +151,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>mc4Field</cstring> </property> @@ -164,7 +164,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>mc4Label</cstring> </property> @@ -183,7 +183,7 @@ <cstring>mc4Field</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>mc5Label</cstring> </property> @@ -213,5 +213,5 @@ <tabstop>mc4Field</tabstop> <tabstop>mc5Field</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp index 9e7c7450..dc91a9cc 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp @@ -27,7 +27,7 @@ #include "MySpinBox.h" -MySpinBox::MySpinBox (TQWidget* parent, const char* name ): TQSpinBox(parent, name ), spin_names (0) +MySpinBox::MySpinBox (TQWidget* tqparent, const char* name ): TQSpinBox(tqparent, name ), spin_names (0) { setWrapping(true); } @@ -48,7 +48,7 @@ TQString MySpinBox::mapValueToText( int value ) if (spin_names != 0) return (*spin_names)[value]; else - return TQString("%1").arg(value); + return TQString("%1").tqarg(value); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h index f17ba8ba..dedb0914 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h +++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h @@ -28,12 +28,12 @@ #include <tqspinbox.h> -class QStringlist; +class TQStringlist; -class MySpinBox : public QSpinBox +class MySpinBox : public TQSpinBox { public: - MySpinBox (TQWidget* parent = 0, const char* name = 0); + MySpinBox (TQWidget* tqparent = 0, const char* name = 0); void setSpecial(const TQString &str); void setData (TQStringList *names, int minValue, int maxValue); diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index 47487624..b2fd3be8 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp @@ -43,11 +43,11 @@ struct KV_Unicode_Ref { wchar_t code; - const char *unicodename; + const char *tqunicodename; const char *audible; }; -KV_Unicode_Ref kv_unicode_ref[] = { +KV_Unicode_Ref kv_tqunicode_ref[] = { {0x00E6, "LATIN SMALL LETTER AE", I18N_NOOP_maybe("")}, {0x00E7, "LATIN SMALL LETTER C WITH CEDILLA", I18N_NOOP_maybe("")}, @@ -116,7 +116,7 @@ KV_Unicode_Ref kv_unicode_ref[] = { {0x0282, "LATIN SMALL LETTER S WITH HOOK", I18N_NOOP_maybe("voiceless retroflex fricative")}, {0x0283, "LATIN SMALL LETTER ESH", I18N_NOOP_maybe("voiceless postalveolar fricative")}, {0x0284, "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK", I18N_NOOP_maybe("implosive palatal stop")}, - {0x0285, "LATIN SMALL LETTER SQUAT REVERSED ESH", I18N_NOOP_maybe("apical retroflex vowel")}, + {0x0285, "LATIN SMALL LETTER STQUAT REVERSED ESH", I18N_NOOP_maybe("apical retroflex vowel")}, {0x0286, "LATIN SMALL LETTER ESH WITH CURL", I18N_NOOP_maybe("palatalized voiceless postalveolar fricative")}, {0x0287, "LATIN SMALL LETTER TURNED T", I18N_NOOP_maybe("dental click")}, {0x0288, "LATIN SMALL LETTER T WITH RETROFLEX HOOK", I18N_NOOP_maybe("voiceless retroflex stop")}, @@ -171,18 +171,18 @@ KV_Unicode_Ref kv_unicode_ref[] = { void PhoneticButton::slotClicked() { if (text().length() != 0) - emit page->charSelected(text()[0].unicode()); + emit page->charSelected(text()[0].tqunicode()); } -PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, const char *name, bool modal) - : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, parent, name, modal) +PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *tqparent, const char *name, bool modal) + : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, tqparent, name, modal) { - int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_ref[0]); + int num = sizeof(kv_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]); TQFrame * phoneticbox = plainPage(); TQGridLayout *gbox = new TQGridLayout(phoneticbox, KV_MAX_HORIZ, (num+KV_MAX_HORIZ-1)/KV_MAX_HORIZ, 1); - KV_Unicode_Ref *uni_ref = kv_unicode_ref; + KV_Unicode_Ref *uni_ref = kv_tqunicode_ref; int vert = 0; int horiz = 0; while (uni_ref->code != 0) { @@ -191,13 +191,13 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this); connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) ); TQString tip = i18n("Unicode name: "); - tip += TQString::fromLatin1(uni_ref->unicodename); + tip += TQString::tqfromLatin1(uni_ref->tqunicodename); tip += "\n"; tip += i18n("Describing the sound of the character", "Sound: "); tip += i18n(uni_ref->audible); butt->setFont(ipafont); - butt->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); - int sz = QMAX(14, int(1.7*ipafont.pointSize())); + butt->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + int sz = TQMAX(14, int(1.7*ipafont.pointSize())); butt->setMaximumSize(TQSize (sz, sz)); gbox->addWidget( butt, vert, horiz, AlignCenter ); TQToolTip::add (butt, tip); @@ -208,7 +208,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co } ++uni_ref; } - resize(sizeHint()); + resize(tqsizeHint()); } @@ -217,7 +217,7 @@ void PhoneticEntryPage::keyPressEvent( TQKeyEvent *e ) if ((e->state() & (ControlButton | AltButton)) == 0) { TQString s = e->text(); for (unsigned i = 0; i < s.length(); ++i) { - emit charSelected(s[i].unicode()); + emit charSelected(s[i].tqunicode()); } e->accept(); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h index d2747015..c422c98a 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h @@ -34,9 +34,10 @@ class PhoneticEntryPage : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent = 0, const char *name = 0, bool modal = false); + PhoneticEntryPage(const TQFont &ipafont, TQWidget *tqparent = 0, const char *name = 0, bool modal = false); signals: void charSelected(wchar_t); @@ -48,13 +49,14 @@ protected: }; -class PhoneticButton : public QPushButton +class PhoneticButton : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - PhoneticButton (const TQString & text, TQWidget * parent, PhoneticEntryPage *_page, const char * name = 0) - : TQPushButton (text, parent, name), page(_page) {} + PhoneticButton (const TQString & text, TQWidget * tqparent, PhoneticEntryPage *_page, const char * name = 0) + : TQPushButton (text, tqparent, name), page(_page) {} protected slots: void slotClicked(); diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp index c8c7d41e..f4823178 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp @@ -39,10 +39,10 @@ TenseEntryPage::TenseEntryPage bool multi_sel, const Conjugation &con_prefix, const Conjugation &conjug, - TQWidget *parent, + TQWidget *tqparent, const char *name ) - : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook) + : TenseEntryPageForm( tqparent, name ), multi_mode(multi_sel), dlgbook(_dlgbook) { connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) ); diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h index 94e7a74c..2473d36c 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h @@ -35,6 +35,7 @@ class EntryDlg; class TenseEntryPage : public TenseEntryPageForm { Q_OBJECT + TQ_OBJECT public: TenseEntryPage @@ -43,7 +44,7 @@ public: bool multi_sel, const Conjugation &con_prefix, const Conjugation &conjugations, - TQWidget *parent = NULL, + TQWidget *tqparent = NULL, const char *name = NULL ); diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui index 1c3c4ee5..d0ccdc74 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TenseEntryPageForm</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TenseEntryPageForm</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox8</cstring> </property> @@ -42,15 +42,15 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="6" column="2"> + <widget class="TQLineEdit" row="6" column="2"> <property name="name"> <cstring>thirdN_plural</cstring> </property> @@ -63,7 +63,7 @@ </sizepolicy> </property> </widget> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>third_p_common</cstring> </property> @@ -71,7 +71,7 @@ <string>C&ommon</string> </property> </widget> - <widget class="QLineEdit" row="2" column="2"> + <widget class="TQLineEdit" row="2" column="2"> <property name="name"> <cstring>second_plural</cstring> </property> @@ -84,7 +84,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="5" column="2"> + <widget class="TQLineEdit" row="5" column="2"> <property name="name"> <cstring>thirdM_plural</cstring> </property> @@ -97,7 +97,7 @@ </sizepolicy> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>third_s_common</cstring> </property> @@ -105,7 +105,7 @@ <string>&Common</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>pers1_label</cstring> </property> @@ -124,7 +124,7 @@ <cstring>first_singular</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>female_label</cstring> </property> @@ -135,7 +135,7 @@ <cstring>thirdF_singular</cstring> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>TextLabel4_2_2</cstring> </property> @@ -143,7 +143,7 @@ <string>Singular</string> </property> </widget> - <widget class="QLineEdit" row="4" column="2"> + <widget class="TQLineEdit" row="4" column="2"> <property name="name"> <cstring>thirdF_plural</cstring> </property> @@ -156,7 +156,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>thirdF_singular</cstring> </property> @@ -169,7 +169,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>pers3_label</cstring> </property> @@ -180,7 +180,7 @@ <cstring>third_s_common</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>first_plural</cstring> </property> @@ -193,7 +193,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>thirdM_singular</cstring> </property> @@ -206,7 +206,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>first_singular</cstring> </property> @@ -229,14 +229,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="6" column="1"> + <widget class="TQLineEdit" row="6" column="1"> <property name="name"> <cstring>thirdN_singular</cstring> </property> @@ -249,7 +249,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>natural_label</cstring> </property> @@ -260,7 +260,7 @@ <cstring>thirdN_singular</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>male_label</cstring> </property> @@ -271,7 +271,7 @@ <cstring>thirdM_singular</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>second_singular</cstring> </property> @@ -284,7 +284,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>pers2_label</cstring> </property> @@ -295,7 +295,7 @@ <cstring>second_singular</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -305,15 +305,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>tenselabel</cstring> </property> @@ -332,7 +332,7 @@ <cstring>tensebox</cstring> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>b_next</cstring> </property> @@ -348,7 +348,7 @@ <string>Ne&xt</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>tensebox</cstring> </property> @@ -383,5 +383,5 @@ <tabstop>thirdM_plural</tabstop> <tabstop>thirdN_plural</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/blockall.h b/kvoctrain/kvoctrain/entry-dialogs/blockall.h index f71230f6..f7d2747d 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/blockall.h +++ b/kvoctrain/kvoctrain/entry-dialogs/blockall.h @@ -28,7 +28,7 @@ #include <tqvalidator.h> -class BlockAllValidator : public QValidator +class BlockAllValidator : public TQValidator { public: BlockAllValidator (); |