diff options
Diffstat (limited to 'kvoctrain/kvoctrain/entry-dialogs')
20 files changed, 406 insertions, 406 deletions
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp index ce97d871..0bdae252 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp @@ -29,17 +29,17 @@ #include <langset.h> -#include <qlineedit.h> +#include <tqlineedit.h> -AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, QWidget *parent, const char *name) +AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent, const char *name) : AdjEntryPageForm( parent, name ), dlgbook(_dlgbook) { comparisons = comp; - connect( lev1Field, SIGNAL(textChanged(const QString&)), SLOT(lev1Changed(const QString&)) ); - connect( lev2Field, SIGNAL(textChanged(const QString&)), SLOT(lev2Changed(const QString&)) ); - connect( lev3Field, SIGNAL(textChanged(const QString&)), SLOT(lev3Changed(const QString&)) ); + connect( lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) ); + connect( lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) ); + connect( lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) ); setData(multi_sel, comp); } @@ -61,21 +61,21 @@ void AdjEntryPage::setData(bool multi_sel, const Comparison &comp) } -void AdjEntryPage::lev1Changed(const QString& s) +void AdjEntryPage::lev1Changed(const TQString& s) { setModified(true); comparisons.setL1 (s); } -void AdjEntryPage::lev2Changed(const QString& s) +void AdjEntryPage::lev2Changed(const TQString& s) { setModified(true); comparisons.setL2 (s); } -void AdjEntryPage::lev3Changed(const QString& s) +void AdjEntryPage::lev3Changed(const TQString& s) { setModified(true); comparisons.setL3 (s); diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h index 095e22d7..efbae74f 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h @@ -37,7 +37,7 @@ class AdjEntryPage : public AdjEntryPageForm Q_OBJECT public: - AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, QWidget *parent = NULL, const char *name = NULL); + AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent = NULL, const char *name = NULL); void setData (bool multi_sel, const Comparison &comp); @@ -51,9 +51,9 @@ signals: void sigModified(); protected slots: - void lev1Changed(const QString&); - void lev2Changed(const QString&); - void lev3Changed(const QString&); + void lev1Changed(const TQString&); + void lev2Changed(const TQString&); + void lev3Changed(const TQString&); protected: Comparison comparisons; diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp index b7c1837e..87e0fe59 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp @@ -23,7 +23,7 @@ * * ***************************************************************************/ -#include <qmultilineedit.h> +#include <tqmultilineedit.h> #include "AuxInfoEntryPage.h" #include "EntryDlg.h" @@ -36,18 +36,18 @@ AuxInfoEntryPage::AuxInfoEntryPage ( EntryDlg *_dlgbook, bool multi_sel, - QString syno, - QString anto, - QString exam, - QString rem, - QString para, - QWidget *parent, + TQString syno, + TQString anto, + TQString exam, + TQString rem, + TQString para, + TQWidget *parent, const char *name ) : AuxInfoEntryPageForm( parent, name ), dlgbook(_dlgbook) { - QFontMetrics fm (synonym_line->font()); + TQFontMetrics fm (synonym_line->font()); int sz = fm.lineSpacing(); synonym_line->setMaximumHeight(sz*3); @@ -56,17 +56,17 @@ AuxInfoEntryPage::AuxInfoEntryPage remark_line->setMaximumHeight(sz*3); examp_line->setMaximumHeight(sz*3); - connect( para_line, SIGNAL(textChanged()), SLOT(slotParaSelected()) ); - connect( remark_line, SIGNAL(textChanged()), SLOT(slotRemarkSelected()) ); - connect( examp_line, SIGNAL(textChanged()), SLOT(slotExampSelected()) ); - connect( antonym_line, SIGNAL(textChanged()), SLOT(slotAntonymSelected()) ); - connect( synonym_line, SIGNAL(textChanged()), SLOT(slotSynonymSelected()) ); + connect( para_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotParaSelected()) ); + connect( remark_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotRemarkSelected()) ); + connect( examp_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotExampSelected()) ); + connect( antonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAntonymSelected()) ); + connect( synonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotSynonymSelected()) ); setData(multi_sel, syno, anto, exam, rem, para); } -void AuxInfoEntryPage::setData(bool multi_sel, QString syno, QString anto, QString example, QString remark, QString para) +void AuxInfoEntryPage::setData(bool multi_sel, TQString syno, TQString anto, TQString example, TQString remark, TQString para) { synonym_line->setText(syno); antonym_line->setText(anto); @@ -121,42 +121,42 @@ void AuxInfoEntryPage::slotParaSelected () } -QString AuxInfoEntryPage::getSynonym () +TQString AuxInfoEntryPage::getSynonym () { normalize(synonym); return synonym; } -QString AuxInfoEntryPage::getAntonym () +TQString AuxInfoEntryPage::getAntonym () { normalize(antonym); return antonym; } -QString AuxInfoEntryPage::getExample () +TQString AuxInfoEntryPage::getExample () { normalize(example); return example; } -QString AuxInfoEntryPage::getRemark () +TQString AuxInfoEntryPage::getRemark () { normalize(remark); return remark; } -QString AuxInfoEntryPage::getParaphrase () +TQString AuxInfoEntryPage::getParaphrase () { normalize(paraphrase); return paraphrase; } -void AuxInfoEntryPage::normalize (QString &str) +void AuxInfoEntryPage::normalize (TQString &str) { LineList ll (str); ll.normalizeWS(); diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h index c9e78bf3..e8e88535 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h @@ -39,22 +39,22 @@ public: ( EntryDlg *dlgbook, bool multi_sel, - QString syno, - QString anto, - QString example, - QString remark, - QString para, - QWidget *parent = 0, + TQString syno, + TQString anto, + TQString example, + TQString remark, + TQString para, + TQWidget *parent = 0, const char *name = 0 ); - void setData(bool multi_sel, QString syno, QString anto, QString example, QString remark, QString para); + void setData(bool multi_sel, TQString syno, TQString anto, TQString example, TQString remark, TQString para); - QString getSynonym (); - QString getAntonym (); - QString getExample (); - QString getRemark (); - QString getParaphrase(); + TQString getSynonym (); + TQString getAntonym (); + TQString getExample (); + TQString getRemark (); + TQString getParaphrase(); bool isModified(); void setModified(bool mod = true); @@ -64,7 +64,7 @@ signals: void sigModified(); protected: - void normalize(QString &str); + void normalize(TQString &str); protected slots: void slotAntonymSelected(); @@ -74,11 +74,11 @@ protected slots: void slotParaSelected(); protected: - QString synonym; - QString antonym; - QString example; - QString remark; - QString paraphrase; + TQString synonym; + TQString antonym; + TQString example; + TQString remark; + TQString paraphrase; bool modified; EntryDlg *dlgbook; }; diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp index 9f5bc8b6..9a7d44fb 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp @@ -26,12 +26,12 @@ #include "CommonEntryPage.h" #include "EntryDlg.h" -#include <qlineedit.h> -#include <qlabel.h> -#include <qlistbox.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qgroupbox.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqlistbox.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> #include <kapplication.h> #include <kdebug.h> @@ -52,18 +52,18 @@ CommonEntryPage::CommonEntryPage EntryDlg *_dlgbook, kvoctrainDoc *_doc, bool multi_sel, - QString expr, + TQString expr, int less, - QComboBox *lessbox, - QString lang, - QString act_type, - QString pron, - QString act_usage, - QString label, + TQComboBox *lessbox, + TQString lang, + TQString act_type, + TQString pron, + TQString act_usage, + TQString label, QueryManager &_querymanager, bool active, - const QFont& _ipafont, - QWidget *parent, + const TQFont& _ipafont, + TQWidget *parent, const char *name ) : @@ -80,18 +80,18 @@ CommonEntryPage::CommonEntryPage ipafont(_ipafont) { - connect( b_usageDlg, SIGNAL(clicked()), SLOT(invokeUsageDlg()) ); - connect( b_LessDlg, SIGNAL(clicked()), SLOT(invokeLessDlg()) ); - connect( b_pronDlg, SIGNAL(clicked()), SLOT(invokePronDlg()) ); - connect( b_TypeDlg, SIGNAL(clicked()), SLOT(invokeTypeDlg()) ); - connect( usage_box, SIGNAL(selectionChanged()), SLOT(slotUsageChanged()) ); - connect( lesson_box, SIGNAL(activated(int)), SLOT(slotLessonSelected(int)) ); - connect( subtype_box, SIGNAL(activated(int)), SLOT(slotSubTypeSelected(int)) ); - connect( type_box, SIGNAL(activated(int)), SLOT(slotTypeSelected(int)) ); - connect( c_active, SIGNAL(toggled(bool)), SLOT(slotActiveChanged(bool)) ); + connect( b_usageDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeUsageDlg()) ); + connect( b_LessDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeLessDlg()) ); + connect( b_pronDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokePronDlg()) ); + connect( b_TypeDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeTypeDlg()) ); + connect( usage_box, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotUsageChanged()) ); + connect( lesson_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotLessonSelected(int)) ); + connect( subtype_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubTypeSelected(int)) ); + connect( type_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeSelected(int)) ); + connect( c_active, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveChanged(bool)) ); - connect( pronunce_line, SIGNAL(textChanged(const QString&)), SLOT(slotPronunceSelected(const QString&)) ); - connect( expr_line, SIGNAL(textChanged(const QString&)), SLOT(slotExprSelected(const QString&)) ); + connect( pronunce_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotPronunceSelected(const TQString&)) ); + connect( expr_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotExprSelected(const TQString&)) ); usage_label->setTitle(i18n("Usage (area) of an Expression", "&Usage Labels")); pronunce_line->setFont(ipafont); @@ -100,12 +100,12 @@ CommonEntryPage::CommonEntryPage type_box->setValidator (new BlockAllValidator() ); subtype_box->setValidator (new BlockAllValidator() ); - QPixmap list_pm = SmallIcon("view_text"); + TQPixmap list_pm = SmallIcon("view_text"); b_LessDlg->setPixmap(list_pm); b_TypeDlg->setPixmap(list_pm); b_usageDlg->setPixmap(list_pm); - QPixmap pron_pm = SmallIcon("view_icon"); + TQPixmap pron_pm = SmallIcon("view_icon"); b_pronDlg->setPixmap(pron_pm); setData(multi_sel, expr, less, lessbox, lang, type, pronunce, act_usage, label, querymanager, active); @@ -114,14 +114,14 @@ CommonEntryPage::CommonEntryPage void CommonEntryPage::setData( bool multi_sel, - QString expr, + TQString expr, int less, - QComboBox *lessBox, - QString /*lang*/, - QString type, - QString pronunce, - QString usage, - QString /*label*/, + TQComboBox *lessBox, + TQString /*lang*/, + TQString type, + TQString pronunce, + TQString usage, + TQString /*label*/, QueryManager &/*querymanager*/, bool active) { @@ -172,12 +172,12 @@ void CommonEntryPage::setData( } -void CommonEntryPage::setTypeBox(const QString &act_type) +void CommonEntryPage::setTypeBox(const TQString &act_type) { all_types = QueryManager::getRelation(false); all_maintypes = QueryManager::getRelation(true); - QString s = QueryManager::getMainType(act_type)+QM_TYPE_DIV; + TQString s = QueryManager::getMainType(act_type)+QM_TYPE_DIV; int curr_type = 0; type_box->clear(); type_box->insertItem (i18n("<none>")); @@ -191,7 +191,7 @@ void CommonEntryPage::setTypeBox(const QString &act_type) } -void CommonEntryPage::setLessonBox(QComboBox *lessbox, int lesson) +void CommonEntryPage::setLessonBox(TQComboBox *lessbox, int lesson) { lesson_box->clear(); for (int i = 0; i < lessbox->count(); i++) @@ -202,13 +202,13 @@ void CommonEntryPage::setLessonBox(QComboBox *lessbox, int lesson) } -void CommonEntryPage::setUsageBox(const QString & act_usage) +void CommonEntryPage::setUsageBox(const TQString & act_usage) { usages = UsageManager::getRelation(); usage_box->clear(); for (int i = 0; i < (int) usages.size(); i++) { usage_box->insertItem (usages[i].longStr()); - if (UsageManager::contains(QString(usages[i].identStr()), act_usage)) { + if (UsageManager::contains(TQString(usages[i].identStr()), act_usage)) { usage_box->setSelected (i, true); } } @@ -221,7 +221,7 @@ void CommonEntryPage::slotUsageChanged() setModified(true); usageCollection = ""; usage_dirty = true; - QString s; + TQString s; for (int i = 0; i < (int) usage_box->count(); i++) { if (usage_box->isSelected(i)) { @@ -254,14 +254,14 @@ void CommonEntryPage::slotActiveChanged(bool state) } -void CommonEntryPage::slotExprSelected (const QString& s) +void CommonEntryPage::slotExprSelected (const TQString& s) { setModified(true); expression = s; } -void CommonEntryPage::slotPronunceSelected (const QString& s) +void CommonEntryPage::slotPronunceSelected (const TQString& s) { setModified(true); pronunce = s; @@ -293,7 +293,7 @@ void CommonEntryPage::slotTypeSelected(int idx) else { type = all_maintypes[idx-1].shortStr(); emit typeSelected(type); - QString main_patt = all_maintypes[idx-1].shortStr()+QM_TYPE_DIV; + TQString main_patt = all_maintypes[idx-1].shortStr()+QM_TYPE_DIV; int sub_idx; if ( idx-1 < (int) all_types.size() ){ for (sub_idx = 0; sub_idx < (int) all_types.size(); sub_idx++) { @@ -303,7 +303,7 @@ void CommonEntryPage::slotTypeSelected(int idx) current_subtypes.push_back(all_maintypes[idx-1].shortStr()); first = false; } - QString s = all_types[sub_idx].longStr(); + TQString s = all_types[sub_idx].longStr(); subtype_box->insertItem (s.stripWhiteSpace()); current_subtypes.push_back(all_types[sub_idx].shortStr()); } @@ -320,7 +320,7 @@ void CommonEntryPage::slotTypeSelected(int idx) void CommonEntryPage::phoneticSelected(wchar_t wc) { setModified(true); - pronunce += QChar(wc); + pronunce += TQChar(wc); pronunce_line->setText(pronunce); } @@ -329,7 +329,7 @@ void CommonEntryPage::invokePronDlg() { //if (phoneticDlg == 0) { PhoneticEntryPage * phoneticDlg = new PhoneticEntryPage (ipafont, this); - connect (phoneticDlg, SIGNAL(charSelected(wchar_t)), SLOT(phoneticSelected(wchar_t)) ); + connect (phoneticDlg, TQT_SIGNAL(charSelected(wchar_t)), TQT_SLOT(phoneticSelected(wchar_t)) ); phoneticDlg->show(); //} //else @@ -340,7 +340,7 @@ void CommonEntryPage::invokePronDlg() void CommonEntryPage::invokeUsageDlg() { vector<int> usageIndex; - vector<QString> new_usageStr; + vector<TQString> new_usageStr; int old_usages = (int) doc->getUsageDescr().size(); @@ -350,7 +350,7 @@ void CommonEntryPage::invokeUsageDlg() UsageOptPage *usageOptPage = new UsageOptPage (doc->getUsageDescr(), doc, this, "name"); usageOpt.setMainWidget(usageOptPage); - if (usageOpt.exec() == QDialog::Accepted) + if (usageOpt.exec() == TQDialog::Accepted) { usageOptPage->getUsageLabels(new_usageStr, usageIndex); UsageOptPage::cleanUnused(doc, usageIndex, old_usages); @@ -365,7 +365,7 @@ void CommonEntryPage::invokeUsageDlg() void CommonEntryPage::invokeLessDlg() { vector<int> lessonIndex; - vector<QString> new_lessonStr; + vector<TQString> new_lessonStr; int old_lessons = (int) lesson_box->count(); KDialogBase lessOpt(KDialogBase::Swallow, i18n("Edit Lesson Names"), @@ -375,7 +375,7 @@ void CommonEntryPage::invokeLessDlg() lessOpt.setMainWidget(lessOptPage); vector<int> lessoninquery = doc->getLessonsInQuery(); - if (lessOpt.exec() == QDialog::Accepted) + if (lessOpt.exec() == TQDialog::Accepted) { lessOptPage->getLesson(lesson_box, lessonIndex); LessOptPage::cleanUnused(doc, lesson_box, lessonIndex, old_lessons, lessoninquery); @@ -392,7 +392,7 @@ void CommonEntryPage::invokeLessDlg() void CommonEntryPage::invokeTypeDlg() { vector<int> typeIndex; - vector<QString> new_typeStr; + vector<TQString> new_typeStr; int old_types = (int) doc->getTypeDescr().size(); KDialogBase typeOpt(KDialogBase::Swallow, i18n("Edit User Defined Types"), @@ -401,7 +401,7 @@ void CommonEntryPage::invokeTypeDlg() TypeOptPage *typeOptPage = new TypeOptPage (doc->getTypeDescr(), doc, this, "name"); typeOpt.setMainWidget(typeOptPage); - if (typeOpt.exec() == QDialog::Accepted) + if (typeOpt.exec() == TQDialog::Accepted) { typeOptPage->getTypeNames(new_typeStr, typeIndex); TypeOptPage::cleanUnused(doc, typeIndex, old_types); diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h index 71bbd84a..9d3652d2 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h @@ -44,31 +44,31 @@ public: EntryDlg *dlgbook, kvoctrainDoc *doc, bool multi_sel, - QString expr, + TQString expr, int less, - QComboBox *lessBox, - QString lang, - QString type, - QString pronunce, - QString usage, - QString label, + TQComboBox *lessBox, + TQString lang, + TQString type, + TQString pronunce, + TQString usage, + TQString label, QueryManager &querymanager, bool active, - const QFont& ipafont, - QWidget* parent = NULL, + const TQFont& ipafont, + TQWidget* parent = NULL, const char* name = NULL ); void setData( bool multi_sel, - QString expr, + TQString expr, int less, - QComboBox *lessBox, - QString lang, - QString type, - QString pronunce, - QString usage, - QString label, + TQComboBox *lessBox, + TQString lang, + TQString type, + TQString pronunce, + TQString usage, + TQString label, QueryManager &querymanager, bool active); @@ -79,10 +79,10 @@ public: bool usageDirty () const { return usage_dirty; } int getLesson () const { return lesson; } - QString getType () const { return type; } - QString getExpr () const { return expression; } - QString getPronunce () const { return pronunce; } - QString getUsageLabel() const { return usageCollection; } + TQString getType () const { return type; } + TQString getExpr () const { return expression; } + TQString getPronunce () const { return pronunce; } + TQString getUsageLabel() const { return usageCollection; } bool getActive () const { return entry_active; } bool isModified(); @@ -90,19 +90,19 @@ public: void setEnabled(int enable_type); signals: - void typeSelected(const QString &); + void typeSelected(const TQString &); protected: - void setTypeBox(const QString &act_type); - void setLessonBox(QComboBox *lessbox, int lesson); - void setUsageBox(const QString & act_type); + void setTypeBox(const TQString &act_type); + void setLessonBox(TQComboBox *lessbox, int lesson); + void setUsageBox(const TQString & act_type); protected slots: void slotLessonSelected(int); - void slotExprSelected(const QString&); + void slotExprSelected(const TQString&); void slotTypeSelected(int); void slotSubTypeSelected(int); - void slotPronunceSelected (const QString&); + void slotPronunceSelected (const TQString&); void slotUsageChanged(); void slotActiveChanged(bool state); void phoneticSelected(wchar_t); @@ -115,11 +115,11 @@ signals: void sigModified(); protected: - QString pronunce; - QString expression; - QString usageCollection; + TQString pronunce; + TQString expression; + TQString usageCollection; int lesson; - QString type; + TQString type; EntryDlg *dlgbook; bool lesson_dirty; bool type_dirty; @@ -132,9 +132,9 @@ protected: vector<TypeRelation> all_maintypes; vector<TypeRelation> all_types; vector<UsageRelation> usages; - vector<QString> current_subtypes; + vector<TQString> current_subtypes; - QFont ipafont; + TQFont ipafont; bool modified; }; #endif // CommonEntryPage_included diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp index 2d60ddb1..c0b249aa 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp @@ -26,8 +26,8 @@ #include "EntryDlg.h" -#include <qlayout.h> -#include <qlineedit.h> +#include <tqlayout.h> +#include <tqlineedit.h> #include <kmainwindow.h> #include <kapplication.h> @@ -49,38 +49,38 @@ EntryDlg::EntryDlg( count_t t_bcount, time_t f_qdate, time_t t_qdate, - QString f_faux_ami, - QString t_faux_ami, - QString expr, + TQString f_faux_ami, + TQString t_faux_ami, + TQString expr, int lesson, - QComboBox *lessonbox, - QString lang, + TQComboBox *lessonbox, + TQString lang, LangSet &langset, - QString rem, - QString type, - QString pronunce, - QString synonym, - QString antonym, - QString example, - QString usagelabel, - QString paraphrase, + TQString rem, + TQString type, + TQString pronunce, + TQString synonym, + TQString antonym, + TQString example, + TQString usagelabel, + TQString paraphrase, const Conjugation &con_prefix, const Conjugation &conjugations, const Article &/*article*/, const Comparison &comp, const MultipleChoice &mc, QueryManager &querymanager, - const QString &title, + const TQString &title, bool active, - const QFont& ipafont, - QWidget *parent, + const TQFont& ipafont, + TQWidget *parent, const char *name, bool modal) : KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, parent, name, modal, false, KGuiItem(i18n("&Reset")), - KGuiItem(QString::null, "view_left_right"), - KGuiItem(QString::null, "view_top_bottom")) + KGuiItem(TQString::null, "view_left_right"), + KGuiItem(TQString::null, "view_top_bottom")) { mainwin = main; @@ -90,19 +90,19 @@ EntryDlg::EntryDlg( from_page = 0; to_page = 0; - QString s; + TQString s; if (langset.findLongId(lang).isEmpty() ) s = lang; else s = langset.findLongId(lang); - QFrame *page; - QVBoxLayout *topLayout; + TQFrame *page; + TQVBoxLayout *topLayout; if (origin) { page = addPage( i18n("Co&mmon") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + 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, @@ -110,29 +110,29 @@ EntryDlg::EntryDlg( topLayout->addWidget(comm_page); page = addPage( i18n("A&dditional") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); aux_page = new AuxInfoEntryPage (this, multi_sel, synonym, antonym, example, rem, paraphrase, page, name); topLayout->addWidget(aux_page); page = addPage( i18n("&Multiple Choice") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); mc_page = new MCEntryPage (this, multi_sel, mc, page, "MultipleChoice"); topLayout->addWidget(mc_page); page = addPage( i18n("Con&jugation") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); tense_page = new TenseEntryPage (this, multi_sel, con_prefix, conjugations, page, "Conjugation"); topLayout->addWidget(tense_page); page = addPage( i18n("Compar&ison") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); adj_page = new AdjEntryPage (this, multi_sel, comp, page, "Comparison"); topLayout->addWidget(adj_page); } else { page = addPage( i18n("Co&mmon") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + 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, @@ -140,35 +140,35 @@ EntryDlg::EntryDlg( topLayout->addWidget(comm_page); page = addPage( i18n("A&dditional") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); aux_page = new AuxInfoEntryPage (this, multi_sel, synonym, antonym, example, rem, paraphrase, page, name); topLayout->addWidget(aux_page); page = addPage( i18n("&Multiple Choice") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); mc_page = new MCEntryPage (this, multi_sel, mc, page, "MultipleChoice"); topLayout->addWidget(mc_page); page = addPage( i18n("Con&jugation") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); tense_page = new TenseEntryPage (this, multi_sel, con_prefix, conjugations, page, "Conjugation"); topLayout->addWidget(tense_page); page = addPage( i18n("Compar&ison") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); adj_page = new AdjEntryPage (this, multi_sel, comp, page, "Comparison"); topLayout->addWidget(adj_page); } page = addPage( i18n("&From Original") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); from_page = new FromToEntryPage (this, multi_sel, f_grd, f_qdate, f_qcount, f_bcount, f_faux_ami, i18n("Properties From Original"), page, name); topLayout->addWidget(from_page); page = addPage( i18n("&To Original") ); - topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); to_page = new FromToEntryPage (this, multi_sel, t_grd, t_qdate, t_qcount, t_bcount, t_faux_ami, i18n("Properties to Original"), page, name); @@ -176,23 +176,23 @@ EntryDlg::EntryDlg( updatePages (type); - connect(comm_page, SIGNAL(typeSelected(const QString&)), SLOT(updatePages(const QString&)) ); + connect(comm_page, TQT_SIGNAL(typeSelected(const TQString&)), TQT_SLOT(updatePages(const TQString&)) ); - connect( this, SIGNAL(user1Clicked()), this, SLOT(slotUndo()) ); - connect( this, SIGNAL(applyClicked()), this, SLOT(slotApply()) ); - connect( this, SIGNAL(user2Clicked()), this, SLOT(slotDockVertical()) ); - connect( this, SIGNAL(user3Clicked()), this, SLOT(slotDockHorizontal()) ); + connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotUndo()) ); + connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApply()) ); + connect( this, TQT_SIGNAL(user2Clicked()), this, TQT_SLOT(slotDockVertical()) ); + connect( this, TQT_SIGNAL(user3Clicked()), this, TQT_SLOT(slotDockHorizontal()) ); - connect (comm_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() )); - connect (aux_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() )); - connect (adj_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() )); - connect (mc_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() )); - connect (tense_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() )); + connect (comm_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (aux_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (adj_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (mc_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (tense_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); if (from_page != 0) - connect (from_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() )); + connect (from_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); if (to_page != 0) - connect (to_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() )); + connect (to_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); enableButtonApply(false); enableButton(User1, false); @@ -212,33 +212,33 @@ void EntryDlg::setData( count_t t_bcount, time_t f_qdate, time_t t_qdate, - QString f_faux_ami, - QString t_faux_ami, - QString expr, + TQString f_faux_ami, + TQString t_faux_ami, + TQString expr, int lesson, - QComboBox *lessonbox, - QString lang, + TQComboBox *lessonbox, + TQString lang, LangSet &langset, - QString rem, - QString type, - QString pronunce, - QString synonym, - QString antonym, - QString example, - QString usagelabel, - QString paraphrase, + TQString rem, + TQString type, + TQString pronunce, + TQString synonym, + TQString antonym, + TQString example, + TQString usagelabel, + TQString paraphrase, const Conjugation &/*con_prefix*/, const Conjugation &conjugations, const Article &/*article*/, const Comparison &comp, const MultipleChoice &mc, QueryManager &querymanager, - const QString &title, + const TQString &title, bool active) { setCaption (kapp->makeStdCaption(title)); - QString s; + TQString s; if (langset.findLongId(lang).isEmpty() ) s = lang; else @@ -265,9 +265,9 @@ void EntryDlg::setData( } -void EntryDlg::updatePages(const QString &type) +void EntryDlg::updatePages(const TQString &type) { - QString main; + TQString main; int pos; if ((pos = type.find (QM_TYPE_DIV)) < 0) // only use main type main = type; @@ -308,8 +308,8 @@ void EntryDlg::setModified(bool mod) void EntryDlg::setEnabled(int enable) { - QString type = comm_page->getType(); - QString main; + TQString type = comm_page->getType(); + TQString main; int pos; if ((pos = type.find (QM_TYPE_DIV)) < 0) // only use main type main = type; @@ -382,7 +382,7 @@ void EntryDlg::slotDisplayModified() } -void EntryDlg::setCell(int row, int col, const vector<QTableSelection>& sel) +void EntryDlg::setCell(int row, int col, const vector<TQTableSelection>& sel) { edit_row = row; edit_col = col; @@ -390,7 +390,7 @@ void EntryDlg::setCell(int row, int col, const vector<QTableSelection>& sel) } -void EntryDlg::getCell(int &row, int &col, vector<QTableSelection>& sel) const +void EntryDlg::getCell(int &row, int &col, vector<TQTableSelection>& sel) const { row = edit_row; col = edit_col; @@ -407,7 +407,7 @@ void EntryDlg::slotDockVertical() } KWinModule info; - QRect rect = info.workArea(); + TQRect rect = info.workArea(); int diff_x = frameGeometry().width()-width(); int diff_y = frameGeometry().height()-height(); @@ -428,7 +428,7 @@ void EntryDlg::slotDockHorizontal() } KWinModule info; - QRect rect = info.workArea(); + TQRect rect = info.workArea(); int diff_x = frameGeometry().width()-width(); int diff_y = frameGeometry().height()-height(); @@ -457,7 +457,7 @@ void EntryDlg::reject () } -void EntryDlg::closeEvent (QCloseEvent * /*e*/) +void EntryDlg::closeEvent (TQCloseEvent * /*e*/) { emit sigEditChoice(EditCancel); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h index f349ccfc..1c8551e3 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h @@ -26,7 +26,7 @@ #ifndef EntryDlg_included #define EntryDlg_included -#include <qtable.h> +#include <tqtable.h> #include <kdialogbase.h> @@ -65,31 +65,31 @@ public: count_t t_bcount, time_t f_qdate, time_t t_qdate, - QString f_faux_ami, - QString t_faux_ami, - QString _expr, + TQString f_faux_ami, + TQString t_faux_ami, + TQString _expr, int _lesson, - QComboBox *_lessonBox, - QString lang, + TQComboBox *_lessonBox, + TQString lang, LangSet &langset, - QString remark, - QString _type, - QString pronunce, - QString synonym, - QString antonym, - QString example, - QString usagelabel, - QString paraphrase, + TQString remark, + TQString _type, + TQString pronunce, + TQString synonym, + TQString antonym, + TQString example, + TQString usagelabel, + TQString paraphrase, const Conjugation &con_prefix, const Conjugation &conjugations, const Article &article, const Comparison &comp, const MultipleChoice &mc, QueryManager &querymanager, - const QString &title, + const TQString &title, bool active, - const QFont& ipafont, - QWidget *parent = 0, + const TQFont& ipafont, + TQWidget *parent = 0, const char *name = 0, bool modal = false ); @@ -108,35 +108,35 @@ public: count_t t_bcount, time_t f_qdate, time_t t_qdate, - QString f_faux_ami, - QString t_faux_ami, - QString _expr, + TQString f_faux_ami, + TQString t_faux_ami, + TQString _expr, int _lesson, - QComboBox *_lessonBox, - QString lang, + TQComboBox *_lessonBox, + TQString lang, LangSet &langset, - QString remark, - QString _type, - QString pronunce, - QString synonym, - QString antonym, - QString example, - QString usagelabel, - QString paraphrase, + TQString remark, + TQString _type, + TQString pronunce, + TQString synonym, + TQString antonym, + TQString example, + TQString usagelabel, + TQString paraphrase, const Conjugation &con_prefix, const Conjugation &conjugations, const Article &article, const Comparison &comp, const MultipleChoice &mc, QueryManager &querymanager, - const QString &title, + const TQString &title, bool active); 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; } - QString getFromFauxAmi () const { return from_page ? from_page->getFauxAmi() : QString(""); } + 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; } @@ -147,7 +147,7 @@ public: 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; } - QString getToFauxAmi () const { return to_page ? to_page->getFauxAmi() : QString(""); } + 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; } @@ -160,17 +160,17 @@ public: bool activeDirty () const { return comm_page->activeDirty (); } int getLesson () const { return comm_page->getLesson(); } - QString getType () const { return comm_page->getType(); } - QString getExpr () const { return comm_page->getExpr(); } - QString getPronunce () const { return comm_page->getPronunce(); } - QString getUsageLabel() const { return comm_page->getUsageLabel(); } + TQString getType () const { return comm_page->getType(); } + TQString getExpr () const { return comm_page->getExpr(); } + TQString getPronunce () const { return comm_page->getPronunce(); } + TQString getUsageLabel() const { return comm_page->getUsageLabel(); } bool getActive() const { return comm_page->getActive(); } - QString getSynonym () const { return aux_page->getSynonym(); } - QString getAntonym () const { return aux_page->getAntonym(); } - QString getRemark () const { return aux_page->getRemark(); } - QString getExample () const { return aux_page->getExample(); } - QString getParaphrase () const { return aux_page->getParaphrase(); } + TQString getSynonym () const { return aux_page->getSynonym(); } + TQString getAntonym () const { return aux_page->getAntonym(); } + TQString getRemark () const { return aux_page->getRemark(); } + TQString getExample () const { return aux_page->getExample(); } + TQString getParaphrase () const { return aux_page->getParaphrase(); } Conjugation getConjugation() const { return tense_page->getConjugation(); } @@ -182,8 +182,8 @@ public: void setModified(bool mod); void setEnabled(int); - void setCell(int row, int col, const vector<QTableSelection>& sel); - void getCell(int &row, int &col, vector<QTableSelection>& sel) const; + void setCell(int row, int col, const vector<TQTableSelection>& sel); + void getCell(int &row, int &col, vector<TQTableSelection>& sel) const; signals: void sigEditChoice(int); @@ -196,11 +196,11 @@ public slots: void slotDockVertical(); protected slots: - void updatePages(const QString &type); + void updatePages(const TQString &type); virtual void reject (); protected: - virtual void closeEvent (QCloseEvent*e); + virtual void closeEvent (TQCloseEvent*e); FromToEntryPage *from_page, *to_page; @@ -210,12 +210,12 @@ protected: AdjEntryPage *adj_page; MCEntryPage *mc_page; int edit_row, edit_col; - QTabWidget *tabber; + TQTabWidget *tabber; - vector<QTableSelection> selections; + vector<TQTableSelection> selections; KMainWindow *mainwin; - QSize oldMainSize; - QPoint oldMainPos; + TQSize oldMainSize; + TQPoint oldMainPos; bool docked; }; diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp index 462cdbf0..0a8bd0cb 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp @@ -27,10 +27,10 @@ #include "FromToEntryPage.h" #include "EntryDlg.h" -#include <qlineedit.h> -#include <qcombobox.h> -#include <qpushbutton.h> -#include <qgroupbox.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> #include <klocale.h> @@ -42,7 +42,7 @@ #include <stdlib.h> -static QStringList monthnames; +static TQStringList monthnames; FromToEntryPage::FromToEntryPage ( @@ -52,9 +52,9 @@ FromToEntryPage::FromToEntryPage time_t _time, count_t _qcount, count_t _bcount, - QString faux, - QString label, - QWidget *parent, + TQString faux, + TQString label, + TQWidget *parent, const char *name ) : @@ -75,23 +75,23 @@ FromToEntryPage::FromToEntryPage monthnames.append (i18n("November")); monthnames.append (i18n("December")); - connect( bcount_line, SIGNAL(textChanged(const QString&)), SLOT(slotBCount(const QString&)) ); - connect( qcount_line, SIGNAL(textChanged(const QString&)), SLOT(slotQCount(const QString&)) ); - connect( fauxami_line, SIGNAL(textChanged(const QString&)), SLOT(slotFauxAmiSelected(const QString&)) ); + 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( fauxami_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFauxAmiSelected(const TQString&)) ); - connect( never, SIGNAL(clicked()), SLOT(slotNever()) ); - connect( today, SIGNAL(clicked()), SLOT(slotToday()) ); - connect( gradebox, SIGNAL(activated(int)), SLOT(slotGradeSelected(int)) ); + connect( never, TQT_SIGNAL(clicked()), TQT_SLOT(slotNever()) ); + connect( today, TQT_SIGNAL(clicked()), TQT_SLOT(slotToday()) ); + connect( gradebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotGradeSelected(int)) ); - connect( year_spin, SIGNAL(valueChanged(int)), SLOT(slotYearChanged(int)) ); - connect( month_spin, SIGNAL(valueChanged(int)), SLOT(slotMonthChanged(int)) ); - connect( day_spin, SIGNAL(valueChanged(int)), SLOT(slotDayChanged(int)) ); + connect( year_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotYearChanged(int)) ); + connect( month_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotMonthChanged(int)) ); + connect( day_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDayChanged(int)) ); - year_spin->setData ((QStringList *) 0, 1980, 2100); + year_spin->setData ((TQStringList *) 0, 1980, 2100); month_spin->setData (&monthnames, 1, 12); - day_spin->setData ((QStringList *) 0, 1, 31); + day_spin->setData ((TQStringList *) 0, 1, 31); - QString s; + TQString s; for (int i = 0; i <= KV_MAX_GRADE; i++) { s.setNum (i); gradebox->insertItem( QueryManager::gradeStr(i) ); @@ -113,8 +113,8 @@ void FromToEntryPage::setData( time_t _time, count_t _qcount, count_t _bcount, - QString faux, - QString label) + TQString faux, + TQString label) { grade = _grade; qcount = _qcount; @@ -123,8 +123,8 @@ void FromToEntryPage::setData( fauxami_line->setText(fauxami); valid_date = false; - QDateTime dt; - QDate date; + TQDateTime dt; + TQDate date; if (_time != 0 && !multi_sel) { dt.setTime_t (_time); valid_date = true; @@ -137,9 +137,9 @@ void FromToEntryPage::setData( day_spin->setValue(day); month_spin->setValue(month); year_spin->setValue(year); - year_spin->setSpecial(QString::null); - month_spin->setSpecial(QString::null); - day_spin->setSpecial(QString::null); + year_spin->setSpecial(TQString::null); + month_spin->setSpecial(TQString::null); + day_spin->setSpecial(TQString::null); } else { dt.setTime_t (time(0L)); @@ -156,7 +156,7 @@ void FromToEntryPage::setData( gradebox->setCurrentItem (grade); - QString s; + TQString s; s.setNum (qcount); qcount_line->setText (s); @@ -185,7 +185,7 @@ void FromToEntryPage::setData( } -void FromToEntryPage::slotFauxAmiSelected(const QString& s) +void FromToEntryPage::slotFauxAmiSelected(const TQString& s) { setModified(true); fauxami = s; @@ -200,7 +200,7 @@ void FromToEntryPage::slotGradeSelected (int g) } -void FromToEntryPage::slotQCount(const QString& s) +void FromToEntryPage::slotQCount(const TQString& s) { setModified(true); qcount_dirty = true; @@ -208,7 +208,7 @@ void FromToEntryPage::slotQCount(const QString& s) } -void FromToEntryPage::slotBCount(const QString& s) +void FromToEntryPage::slotBCount(const TQString& s) { setModified(true); bcount_dirty = true; @@ -220,9 +220,9 @@ time_t FromToEntryPage::getDate () const { // FIXME: warning dialog/don`t quit dialog when date invalid if (valid_date) { - QDate act_date (year, month, day); - QDateTime time_null (QDate (1970, 1, 1), QTime (0,0,0)); - return -QDateTime(act_date).secsTo (time_null); + TQDate act_date (year, month, day); + TQDateTime time_null (TQDate (1970, 1, 1), TQTime (0,0,0)); + return -TQDateTime(act_date).secsTo (time_null); } else return 0; @@ -249,7 +249,7 @@ void FromToEntryPage::slotYearChanged(int new_year) new_year = year; } - year_spin->setSpecial(QString::null); + year_spin->setSpecial(TQString::null); year = new_year; validate(); @@ -278,7 +278,7 @@ void FromToEntryPage::slotMonthChanged(int new_month) new_month = month; } - month_spin->setSpecial(QString::null); + month_spin->setSpecial(TQString::null); month = new_month; validate(); @@ -306,7 +306,7 @@ void FromToEntryPage::slotDayChanged(int new_day) new_day = day; } - day_spin->setSpecial(QString::null); + day_spin->setSpecial(TQString::null); day = new_day; validate(); @@ -329,7 +329,7 @@ void FromToEntryPage::slotToday() { setModified(true); date_dirty = true; - QDateTime dt; + TQDateTime dt; dt.setTime_t (time(0L)); year = dt.date().year(); @@ -339,9 +339,9 @@ void FromToEntryPage::slotToday() day_spin->setValue(day); month_spin->setValue(month); year_spin->setValue(year); - year_spin->setSpecial(QString::null); - month_spin->setSpecial(QString::null); - day_spin->setSpecial(QString::null); + year_spin->setSpecial(TQString::null); + month_spin->setSpecial(TQString::null); + day_spin->setSpecial(TQString::null); validate(); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h index ad322eff..238f4462 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h @@ -29,7 +29,7 @@ #include "FromToEntryPageForm.h" #include <time.h> -#include <qdatetime.h> +#include <tqdatetime.h> #include <kvoctraindoc.h> @@ -49,9 +49,9 @@ public: time_t _date, count_t _qcount, count_t _bcount, - QString faux, - QString label, - QWidget *parent = NULL, + TQString faux, + TQString label, + TQWidget *parent = NULL, const char *name = NULL ); @@ -61,8 +61,8 @@ public: time_t _date, count_t _qcount, count_t _bcount, - QString faux, - QString label); + TQString faux, + TQString label); time_t dateDirty () const { return date_dirty; } grade_t gradeDirty () const { return grade_dirty; } @@ -74,7 +74,7 @@ public: count_t getQCount () const { return qcount; } count_t getBCount () const { return bcount; } - QString getFauxAmi () const { return fauxami; } + TQString getFauxAmi () const { return fauxami; } bool isModified(); void setModified(bool mod = true); @@ -85,8 +85,8 @@ signals: protected slots: void slotGradeSelected(int); - void slotQCount(const QString&); - void slotBCount(const QString&); + void slotQCount(const TQString&); + void slotBCount(const TQString&); void slotIncYear(); void slotIncMonth(); @@ -96,7 +96,7 @@ protected slots: void slotDecDay(); void slotToday(); void slotNever(); - void slotFauxAmiSelected(const QString&); + void slotFauxAmiSelected(const TQString&); void slotDayChanged(int); void slotMonthChanged(int); @@ -105,7 +105,7 @@ protected slots: protected: void validate(); - QString fauxami; + TQString fauxami; bool valid_date; bool date_dirty, qcount_dirty, diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp index a26e43ed..a6967704 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp @@ -29,19 +29,19 @@ #include <langset.h> -#include <qlineedit.h> +#include <tqlineedit.h> -MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, QWidget *parent, const char *name) +MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent, const char *name) : MCEntryPageForm( parent, name ), dlgbook(_dlgbook) { multiplechoice = mc; - connect( mc1Field, SIGNAL(textChanged(const QString&)), SLOT(mc1Changed(const QString&)) ); - connect( mc2Field, SIGNAL(textChanged(const QString&)), SLOT(mc2Changed(const QString&)) ); - connect( mc3Field, SIGNAL(textChanged(const QString&)), SLOT(mc3Changed(const QString&)) ); - connect( mc4Field, SIGNAL(textChanged(const QString&)), SLOT(mc4Changed(const QString&)) ); - connect( mc5Field, SIGNAL(textChanged(const QString&)), SLOT(mc5Changed(const QString&)) ); + connect( mc1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc1Changed(const TQString&)) ); + connect( mc2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc2Changed(const TQString&)) ); + connect( mc3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc3Changed(const TQString&)) ); + connect( mc4Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc4Changed(const TQString&)) ); + connect( mc5Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc5Changed(const TQString&)) ); setData(multi_sel, mc); } @@ -68,35 +68,35 @@ void MCEntryPage::setData(bool multi_sel, const MultipleChoice &mc) } -void MCEntryPage::mc1Changed(const QString& s) +void MCEntryPage::mc1Changed(const TQString& s) { setModified(true); multiplechoice.setMC1 (s); } -void MCEntryPage::mc2Changed(const QString& s) +void MCEntryPage::mc2Changed(const TQString& s) { setModified(true); multiplechoice.setMC2 (s); } -void MCEntryPage::mc3Changed(const QString& s) +void MCEntryPage::mc3Changed(const TQString& s) { setModified(true); multiplechoice.setMC3 (s); } -void MCEntryPage::mc4Changed(const QString& s) +void MCEntryPage::mc4Changed(const TQString& s) { setModified(true); multiplechoice.setMC4 (s); } -void MCEntryPage::mc5Changed(const QString& s) +void MCEntryPage::mc5Changed(const TQString& s) { setModified(true); multiplechoice.setMC5 (s); diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h index 23fb441a..c2938814 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h @@ -37,7 +37,7 @@ class MCEntryPage : public MCEntryPageForm Q_OBJECT public: - MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, QWidget *parent = NULL, const char *name = NULL); + MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent = NULL, const char *name = NULL); void setData(bool multi_sel, const MultipleChoice &mc); @@ -51,11 +51,11 @@ signals: void sigModified(); protected slots: - void mc1Changed(const QString&); - void mc2Changed(const QString&); - void mc3Changed(const QString&); - void mc4Changed(const QString&); - void mc5Changed(const QString&); + void mc1Changed(const TQString&); + void mc2Changed(const TQString&); + void mc3Changed(const TQString&); + void mc4Changed(const TQString&); + void mc5Changed(const TQString&); protected: MultipleChoice multiplechoice; diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp index f8d1e6f9..9e7c7450 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp @@ -27,20 +27,20 @@ #include "MySpinBox.h" -MySpinBox::MySpinBox (QWidget* parent, const char* name ): QSpinBox(parent, name ), spin_names (0) +MySpinBox::MySpinBox (TQWidget* parent, const char* name ): TQSpinBox(parent, name ), spin_names (0) { setWrapping(true); } -void MySpinBox::setData (QStringList *names, int minValue, int maxValue) +void MySpinBox::setData (TQStringList *names, int minValue, int maxValue) { spin_names = names; setRange (minValue, maxValue); } -QString MySpinBox::mapValueToText( int value ) +TQString MySpinBox::mapValueToText( int value ) { if (special_str.length() != 0 ) return special_str; @@ -48,7 +48,7 @@ QString MySpinBox::mapValueToText( int value ) if (spin_names != 0) return (*spin_names)[value]; else - return QString("%1").arg(value); + return TQString("%1").arg(value); } @@ -58,7 +58,7 @@ int MySpinBox::MySpinBox::mapTextToValue(bool *) } -void MySpinBox::setSpecial(const QString &str) +void MySpinBox::setSpecial(const TQString &str) { special_str = str; setSuffix(""); // update display diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h index 284bb8ea..f17ba8ba 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h +++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h @@ -26,23 +26,23 @@ #ifndef MySpinbox_included #define MySpinbox_included -#include <qspinbox.h> +#include <tqspinbox.h> class QStringlist; class MySpinBox : public QSpinBox { public: - MySpinBox (QWidget* parent = 0, const char* name = 0); + MySpinBox (TQWidget* parent = 0, const char* name = 0); - void setSpecial(const QString &str); - void setData (QStringList *names, int minValue, int maxValue); - virtual QString mapValueToText( int value ); + void setSpecial(const TQString &str); + void setData (TQStringList *names, int minValue, int maxValue); + virtual TQString mapValueToText( int value ); virtual int mapTextToValue( bool* ok ); protected: - QStringList *spin_names; - QString special_str; + TQStringList *spin_names; + TQString special_str; }; #endif // MySpinbox_included diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index 6d26be5a..47487624 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp @@ -26,10 +26,10 @@ #include "PhoneticEntryPage.h" -#include <qlayout.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqtooltip.h> #include <kdebug.h> #include <klocale.h> @@ -175,32 +175,32 @@ void PhoneticButton::slotClicked() } -PhoneticEntryPage::PhoneticEntryPage(const QFont &ipafont, QWidget *parent, const char *name, bool modal) +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) { int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_ref[0]); - QFrame * phoneticbox = plainPage(); - QGridLayout *gbox = new QGridLayout(phoneticbox, KV_MAX_HORIZ, (num+KV_MAX_HORIZ-1)/KV_MAX_HORIZ, 1); + 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; int vert = 0; int horiz = 0; while (uni_ref->code != 0) { - QChar qc = uni_ref->code; - QString text = qc; + TQChar qc = uni_ref->code; + TQString text = qc; PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this); - connect (butt, SIGNAL(clicked()), butt, SLOT(slotClicked()) ); - QString tip = i18n("Unicode name: "); - tip += QString::fromLatin1(uni_ref->unicodename); + connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) ); + TQString tip = i18n("Unicode name: "); + tip += TQString::fromLatin1(uni_ref->unicodename); tip += "\n"; tip += i18n("Describing the sound of the character", "Sound: "); tip += i18n(uni_ref->audible); butt->setFont(ipafont); - butt->setSizePolicy(QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed)); + butt->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); int sz = QMAX(14, int(1.7*ipafont.pointSize())); - butt->setMaximumSize(QSize (sz, sz)); + butt->setMaximumSize(TQSize (sz, sz)); gbox->addWidget( butt, vert, horiz, AlignCenter ); - QToolTip::add (butt, tip); + TQToolTip::add (butt, tip); if (++horiz >= KV_MAX_HORIZ) { ++vert; @@ -212,10 +212,10 @@ PhoneticEntryPage::PhoneticEntryPage(const QFont &ipafont, QWidget *parent, cons } -void PhoneticEntryPage::keyPressEvent( QKeyEvent *e ) +void PhoneticEntryPage::keyPressEvent( TQKeyEvent *e ) { if ((e->state() & (ControlButton | AltButton)) == 0) { - QString s = e->text(); + TQString s = e->text(); for (unsigned i = 0; i < s.length(); ++i) { emit charSelected(s[i].unicode()); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h index cf12ef48..d2747015 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h @@ -27,7 +27,7 @@ #ifndef PHONETICENTRYPAGE_H #define PHONETICENTRYPAGE_H -#include <qpushbutton.h> +#include <tqpushbutton.h> #include <kdialogbase.h> @@ -36,13 +36,13 @@ class PhoneticEntryPage : public KDialogBase Q_OBJECT public: - PhoneticEntryPage(const QFont &ipafont, QWidget *parent = 0, const char *name = 0, bool modal = false); + PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent = 0, const char *name = 0, bool modal = false); signals: void charSelected(wchar_t); protected: - void keyPressEvent( QKeyEvent *e ); + void keyPressEvent( TQKeyEvent *e ); friend class PhoneticButton; }; @@ -53,8 +53,8 @@ class PhoneticButton : public QPushButton Q_OBJECT public: - PhoneticButton (const QString & text, QWidget * parent, PhoneticEntryPage *_page, const char * name = 0) - : QPushButton (text, parent, name), page(_page) {} + PhoneticButton (const TQString & text, TQWidget * parent, PhoneticEntryPage *_page, const char * name = 0) + : TQPushButton (text, parent, name), page(_page) {} protected slots: void slotClicked(); diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp index 30fa4fdd..c8c7d41e 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp @@ -23,10 +23,10 @@ * * ***************************************************************************/ -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qlineedit.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> #include <langset.h> @@ -39,27 +39,27 @@ TenseEntryPage::TenseEntryPage bool multi_sel, const Conjugation &con_prefix, const Conjugation &conjug, - QWidget *parent, + TQWidget *parent, const char *name ) : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook) { - connect( third_p_common, SIGNAL(toggled(bool)), SLOT(slotThirdPCommonToggled(bool)) ); - connect( third_s_common, SIGNAL(toggled(bool)), SLOT(slotThirdSCommonToggled(bool)) ); - connect( b_next, SIGNAL(clicked()), SLOT(slotNextConj()) ); - connect( tensebox, SIGNAL(activated(int)), SLOT(slotTenseSelected(int)) ); - - connect( thirdN_plural, SIGNAL(textChanged(const QString&)), SLOT(thirdNPluralChanged(const QString&)) ); - connect( thirdN_singular, SIGNAL(textChanged(const QString&)), SLOT(thirdNSingularChanged(const QString&)) ); - connect( thirdM_plural, SIGNAL(textChanged(const QString&)), SLOT(thirdMPluralChanged(const QString&)) ); - connect( thirdM_singular, SIGNAL(textChanged(const QString&)), SLOT(thirdMSingularChanged(const QString&)) ); - connect( thirdF_plural, SIGNAL(textChanged(const QString&)), SLOT(thirdFPluralChanged(const QString&)) ); - connect( thirdF_singular, SIGNAL(textChanged(const QString&)), SLOT(thirdFSingularChanged(const QString&)) ); - connect( second_plural, SIGNAL(textChanged(const QString&)), SLOT(secondPluralChanged(const QString&)) ); - connect( second_singular, SIGNAL(textChanged(const QString&)), SLOT(secondSingularChanged(const QString&)) ); - connect( first_plural, SIGNAL(textChanged(const QString&)), SLOT(firstPluralChanged(const QString&)) ); - connect( first_singular, SIGNAL(textChanged(const QString&)), SLOT(firstSingularChanged(const QString&)) ); + connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) ); + connect( third_s_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) ); + connect( b_next, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextConj()) ); + connect( tensebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTenseSelected(int)) ); + + connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) ); + connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) ); + connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) ); + connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) ); + connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) ); + connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) ); + connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) ); + connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) ); + connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) ); + connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) ); prefix = con_prefix; selection = ""; @@ -98,7 +98,7 @@ void TenseEntryPage::setData(bool /*multi_sel*/, const Conjugation &conjug) } -void TenseEntryPage::firstPluralChanged(const QString& s) +void TenseEntryPage::firstPluralChanged(const TQString& s) { conjugations.setPers1Plural (selection, s); updateFields(); @@ -106,7 +106,7 @@ void TenseEntryPage::firstPluralChanged(const QString& s) } -void TenseEntryPage::firstSingularChanged(const QString& s) +void TenseEntryPage::firstSingularChanged(const TQString& s) { conjugations.setPers1Singular (selection, s); updateFields(); @@ -114,7 +114,7 @@ void TenseEntryPage::firstSingularChanged(const QString& s) } -void TenseEntryPage::secondSingularChanged(const QString& s) +void TenseEntryPage::secondSingularChanged(const TQString& s) { conjugations.setPers2Singular (selection, s); updateFields(); @@ -122,7 +122,7 @@ void TenseEntryPage::secondSingularChanged(const QString& s) } -void TenseEntryPage::secondPluralChanged(const QString& s) +void TenseEntryPage::secondPluralChanged(const TQString& s) { conjugations.setPers2Plural (selection, s); updateFields(); @@ -130,7 +130,7 @@ void TenseEntryPage::secondPluralChanged(const QString& s) } -void TenseEntryPage::thirdFPluralChanged(const QString& s) +void TenseEntryPage::thirdFPluralChanged(const TQString& s) { conjugations.setPers3FemalePlural (selection, s); updateFields(); @@ -138,7 +138,7 @@ void TenseEntryPage::thirdFPluralChanged(const QString& s) } -void TenseEntryPage::thirdFSingularChanged(const QString& s) +void TenseEntryPage::thirdFSingularChanged(const TQString& s) { conjugations.setPers3FemaleSingular (selection, s); updateFields(); @@ -146,7 +146,7 @@ void TenseEntryPage::thirdFSingularChanged(const QString& s) } -void TenseEntryPage::thirdMSingularChanged(const QString& s) +void TenseEntryPage::thirdMSingularChanged(const TQString& s) { conjugations.setPers3MaleSingular (selection, s); updateFields(); @@ -154,7 +154,7 @@ void TenseEntryPage::thirdMSingularChanged(const QString& s) } -void TenseEntryPage::thirdNSingularChanged(const QString& s) +void TenseEntryPage::thirdNSingularChanged(const TQString& s) { conjugations.setPers3NaturalSingular(selection, s); updateFields(); @@ -162,7 +162,7 @@ void TenseEntryPage::thirdNSingularChanged(const QString& s) } -void TenseEntryPage::thirdNPluralChanged(const QString& s) +void TenseEntryPage::thirdNPluralChanged(const TQString& s) { conjugations.setPers3NaturalPlural (selection, s); updateFields(); @@ -170,7 +170,7 @@ void TenseEntryPage::thirdNPluralChanged(const QString& s) } -void TenseEntryPage::thirdMPluralChanged(const QString& s) +void TenseEntryPage::thirdMPluralChanged(const TQString& s) { conjugations.setPers3MalePlural (selection, s); updateFields(); diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h index 5c118e8d..94e7a74c 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h @@ -43,7 +43,7 @@ public: bool multi_sel, const Conjugation &con_prefix, const Conjugation &conjugations, - QWidget *parent = NULL, + TQWidget *parent = NULL, const char *name = NULL ); @@ -62,17 +62,17 @@ protected: void updateFields(); protected slots: - void secondPluralChanged(const QString&); - void secondSingularChanged(const QString&); - void thirdNSingularChanged(const QString&); - void thirdFPluralChanged(const QString&); - void thirdMSingularChanged(const QString&); - void thirdFSingularChanged(const QString&); + void secondPluralChanged(const TQString&); + void secondSingularChanged(const TQString&); + void thirdNSingularChanged(const TQString&); + void thirdFPluralChanged(const TQString&); + void thirdMSingularChanged(const TQString&); + void thirdFSingularChanged(const TQString&); void slotTenseSelected(int); - void thirdMPluralChanged(const QString&); - void thirdNPluralChanged(const QString&); - void firstSingularChanged(const QString&); - void firstPluralChanged(const QString&); + void thirdMPluralChanged(const TQString&); + void thirdNPluralChanged(const TQString&); + void firstSingularChanged(const TQString&); + void firstPluralChanged(const TQString&); void slotThirdSCommonToggled(bool); void slotThirdPCommonToggled(bool); void slotNextConj(); @@ -80,7 +80,7 @@ protected slots: protected: Conjugation prefix, conjugations; - QString selection; + TQString selection; bool multi_mode; bool modified; EntryDlg *dlgbook; diff --git a/kvoctrain/kvoctrain/entry-dialogs/blockall.cpp b/kvoctrain/kvoctrain/entry-dialogs/blockall.cpp index 879acd8d..a21fd2b8 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/blockall.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/blockall.cpp @@ -25,12 +25,12 @@ #include "blockall.h" -BlockAllValidator::BlockAllValidator() : QValidator (0, 0) +BlockAllValidator::BlockAllValidator() : TQValidator (0, 0) { } -BlockAllValidator::State BlockAllValidator::validate (QString&, int& ) const +BlockAllValidator::State BlockAllValidator::validate (TQString&, int& ) const { return Invalid; } diff --git a/kvoctrain/kvoctrain/entry-dialogs/blockall.h b/kvoctrain/kvoctrain/entry-dialogs/blockall.h index 96b115be..f71230f6 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/blockall.h +++ b/kvoctrain/kvoctrain/entry-dialogs/blockall.h @@ -26,13 +26,13 @@ #ifndef BlockAll_included #define BlockAll_included -#include <qvalidator.h> +#include <tqvalidator.h> class BlockAllValidator : public QValidator { public: BlockAllValidator (); - State validate (QString&, int& ) const; + State validate (TQString&, int& ) const; }; #endif // BlockAll_included |