From 98a12d05a48814bec3870b9a6d5865475cfa1c95 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 4 Jan 2011 02:22:38 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1211429 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../kvoctrain/common-dialogs/ProgressDlgForm.ui | 10 ++-- .../kvoctrain/common-dialogs/blockoptionsbase.ui | 8 +-- .../kvoctrain/common-dialogs/generaloptionsbase.ui | 8 +-- .../kvoctrain/common-dialogs/groupoptionsbase.ui | 8 +-- .../kvoctrain/common-dialogs/languageoptions.cpp | 68 +++++++++++----------- .../common-dialogs/languageoptionsbase.ui | 20 +++---- .../kvoctrain/common-dialogs/pasteoptions.cpp | 4 +- .../kvoctrain/common-dialogs/pasteoptionsbase.ui | 12 ++-- .../kvoctrain/common-dialogs/queryoptionsbase.ui | 18 +++--- .../common-dialogs/thresholdoptionsbase.ui | 12 ++-- .../kvoctrain/common-dialogs/viewoptionsbase.ui | 6 +- .../docprop-dialogs/DocOptionsPageForm.ui | 4 +- .../kvoctrain/docprop-dialogs/LangPropPageForm.ui | 12 ++-- .../kvoctrain/docprop-dialogs/LessOptPage.cpp | 2 +- kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h | 2 +- .../kvoctrain/docprop-dialogs/LessOptPageForm.ui | 6 +- .../kvoctrain/docprop-dialogs/TenseOptPage.cpp | 2 +- kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h | 2 +- .../kvoctrain/docprop-dialogs/TenseOptPageForm.ui | 6 +- .../kvoctrain/docprop-dialogs/TitlePageForm.ui | 8 +-- .../kvoctrain/docprop-dialogs/TypeOptPage.cpp | 2 +- kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h | 2 +- .../kvoctrain/docprop-dialogs/TypeOptPageForm.ui | 6 +- .../kvoctrain/docprop-dialogs/UsageOptPage.cpp | 2 +- kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h | 2 +- .../kvoctrain/docprop-dialogs/UsageOptPageForm.ui | 6 +- .../kvoctrain/entry-dialogs/AdjEntryPageForm.ui | 4 +- .../entry-dialogs/AuxInfoEntryPageForm.ui | 14 ++--- .../kvoctrain/entry-dialogs/CommonEntryPage.cpp | 2 +- .../kvoctrain/entry-dialogs/CommonEntryPageForm.ui | 30 +++++----- kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h | 4 +- .../kvoctrain/entry-dialogs/FromToEntryPage.h | 2 +- .../kvoctrain/entry-dialogs/FromToEntryPageForm.ui | 14 ++--- .../kvoctrain/entry-dialogs/MCEntryPageForm.ui | 4 +- .../kvoctrain/entry-dialogs/PhoneticEntryPage.cpp | 18 +++--- .../kvoctrain/entry-dialogs/TenseEntryPageForm.ui | 10 ++-- kvoctrain/kvoctrain/kv_resource.h | 2 +- kvoctrain/kvoctrain/kva_clip.cpp | 8 +-- kvoctrain/kvoctrain/kva_header.cpp | 54 ++++++++--------- kvoctrain/kvoctrain/kva_init.cpp | 12 ++-- kvoctrain/kvoctrain/kva_io.cpp | 58 +++++++++--------- kvoctrain/kvoctrain/kva_query.cpp | 20 +++---- kvoctrain/kvoctrain/kvoctrain.cpp | 44 +++++++------- kvoctrain/kvoctrain/kvoctrain.h | 6 +- kvoctrain/kvoctrain/kvoctraintable.cpp | 14 ++--- kvoctrain/kvoctrain/kvoctraintable.h | 4 +- kvoctrain/kvoctrain/kvoctraintableitem.cpp | 4 +- kvoctrain/kvoctrain/kvoctrainview.cpp | 22 +++---- kvoctrain/kvoctrain/kvoctrainview.h | 2 +- kvoctrain/kvoctrain/kvt-core/UsageManager.cpp | 2 +- kvoctrain/kvoctrain/kvt-core/UsageManager.h | 2 +- kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp | 32 +++++----- kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp | 4 +- kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp | 2 +- kvoctrain/kvoctrain/kvt-core/kvoctraincore.h | 2 +- kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp | 4 +- kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h | 4 +- kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h | 2 +- kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h | 6 +- kvoctrain/kvoctrain/kvt-core/langset.cpp | 4 +- kvoctrain/kvoctrain/kvt-core/langset.h | 4 +- kvoctrain/kvoctrain/kvtnewstuff.cpp | 4 +- .../kvoctrain/query-dialogs/AdjQueryDlgForm.ui | 10 ++-- .../kvoctrain/query-dialogs/ArtQueryDlgForm.ui | 10 ++-- .../kvoctrain/query-dialogs/MCQueryDlgForm.ui | 18 +++--- kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp | 34 +++++------ .../kvoctrain/query-dialogs/RandomQueryDlg.cpp | 8 +-- .../kvoctrain/query-dialogs/RandomQueryDlgForm.ui | 10 ++-- .../kvoctrain/query-dialogs/SimpleQueryDlg.cpp | 6 +- .../kvoctrain/query-dialogs/SimpleQueryDlgForm.ui | 14 ++--- .../kvoctrain/query-dialogs/VerbQueryDlgForm.ui | 20 +++---- .../kvoctrain/statistik-dialogs/GenStatPageForm.ui | 6 +- .../statistik-dialogs/StatistikPageForm.ui | 6 +- kvoctrain/kvoctrain/tools/extractlang.cpp | 8 +-- 74 files changed, 406 insertions(+), 406 deletions(-) (limited to 'kvoctrain') diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui index 2c5d44cb..33e090c9 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui @@ -4,7 +4,7 @@ Form1 - + 0 0 @@ -12,7 +12,7 @@ 127 - + 400 120 @@ -110,7 +110,7 @@ Expanding - + 20 20 @@ -129,7 +129,7 @@ 0 - + 340 22 @@ -138,5 +138,5 @@ - + diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui index 2bd5c449..6909eae0 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui @@ -4,7 +4,7 @@ BlockOptionsBase - + 0 0 @@ -190,7 +190,7 @@ Minimum - + 41 20 @@ -241,7 +241,7 @@ Expanding - + 380 30 @@ -268,5 +268,5 @@ block1 expire1 - + diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui index 3e8b5425..ce13b10c 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui @@ -4,7 +4,7 @@ GeneralOptionsBase - + 0 0 @@ -122,7 +122,7 @@ KVocTrain determines the resizing of the columns - KVocTrain makes each column the same width except the leftmost with the lesson names, which is half the size of the others. The second column, which contains the picture that describes the state of the row, has a fixed width. + KVocTrain makes each column the same width except the leftmost with the lesson names, which is half the size of the others. The second column, which tqcontains the picture that describes the state of the row, has a fixed width. @@ -165,7 +165,7 @@ Expanding - + 51 123 @@ -182,7 +182,7 @@ setEnabled(bool) - + knuminput.h diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui index ee90fe3a..cc4b4f27 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui @@ -4,7 +4,7 @@ GroupOptionsBase - + 0 0 @@ -32,7 +32,7 @@ - layout1 + tqlayout1 @@ -127,7 +127,7 @@ Expanding - + 150 16 @@ -143,5 +143,5 @@ ps_new ps_del - + diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index 5da383b0..d92a9423 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -689,7 +689,7 @@ LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char connect(d_shortName, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotShortActivated(const TQString&))); connect(e_langLong, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLangChanged(const TQString&))); connect(e_shortName2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotShort2Changed(const TQString&))); - connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); + connect(d_kbtqlayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); // Load the languages first, then the countries and create the // menus for the languages last, so they will have flags @@ -768,13 +768,13 @@ void LanguageOptions::slotDeleteClicked() enableLangWidgets(); // doesn't work yet - if (d_shortName->count() != 0 && d_kblayout->isEnabled()) + if (d_shortName->count() != 0 && d_kbtqlayout->isEnabled()) { - for (int i = 0; i < d_kblayout->count(); i++) + for (int i = 0; i < d_kbtqlayout->count(); i++) { - if (d_kblayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem())) + if (d_kbtqlayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem())) { - d_kblayout->setCurrentItem(i); + d_kbtqlayout->setCurrentItem(i); break; } } @@ -782,9 +782,9 @@ void LanguageOptions::slotDeleteClicked() } -void LanguageOptions::slotKeyboardLayoutChanged(const TQString& layout) +void LanguageOptions::slotKeyboardLayoutChanged(const TQString& tqlayout) { - m_langSet.setKeyboardLayout(layout, d_shortName->currentItem()); + m_langSet.setKeyboardLayout(tqlayout, d_shortName->currentItem()); emit widgetModified(); m_hasChanged = true; } @@ -814,20 +814,20 @@ void LanguageOptions::enableLangWidgets() { if (replyType == "TQStringList") { - TQStringList layouts; + TQStringList tqlayouts; TQDataStream stream(replyData, IO_ReadOnly); - stream >> layouts; - layouts.prepend(TQString::null); - d_kblayout->clear(); - d_kblayout->insertStringList(layouts); + stream >> tqlayouts; + tqlayouts.prepend(TQString::null); + d_kbtqlayout->clear(); + d_kbtqlayout->insertStringList(tqlayouts); } } } else { //kdDebug() << "kxkb not enabled" << endl; - d_kblayout->clear(); - d_kblayout->setEnabled(false); + d_kbtqlayout->clear(); + d_kbtqlayout->setEnabled(false); } } @@ -898,22 +898,22 @@ void LanguageOptions::slotShortActivated(const TQString& _id) else b_langPixmap->setText (i18n("No Picture Selected")); - TQString layout = m_langSet.keyboardLayout(d_shortName->currentItem()); + TQString tqlayout = m_langSet.keyboardLayout(d_shortName->currentItem()); - //kdDebug() << "layout to select " << layout << endl; + //kdDebug() << "tqlayout to select " << tqlayout << endl; - for (int i = 0; i < d_kblayout->count(); i++) + for (int i = 0; i < d_kbtqlayout->count(); i++) { - if (d_kblayout->text(i) == layout) + if (d_kbtqlayout->text(i) == tqlayout) { - d_kblayout->setCurrentItem(i); + d_kbtqlayout->setCurrentItem(i); break; } } // not found - if (d_kblayout->currentText() != layout) + if (d_kbtqlayout->currentText() != tqlayout) { - d_kblayout->setCurrentItem(0); + d_kbtqlayout->setCurrentItem(0); } } } @@ -1015,8 +1015,8 @@ void LanguageOptions::loadCountryData() locale.setLanguage(curr_lang); KGlobal::_locale = &locale; - TQString sub = TQString::fromLatin1("l10n/"); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); + TQString sub = TQString::tqfromLatin1("l10n/"); + TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop")); regionlist.sort(); TQMap regions; @@ -1033,22 +1033,22 @@ void LanguageOptions::loadCountryData() if (index != -1) tag.truncate(index); KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); regions.insert(tag, Region(name)); } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); + TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop")); int idx = 0; for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit) { KSimpleConfig entry(*sit); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); - TQString submenu = entry.readEntry(TQString::fromLatin1("Region")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + TQString submenu = entry.readEntry(TQString::tqfromLatin1("Region")); TQString tag = *sit; int index = tag.findRev('/'); @@ -1059,7 +1059,7 @@ void LanguageOptions::loadCountryData() if (tag == "C") continue; - TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::fromLatin1("Languages"))); + TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::tqfromLatin1("Languages"))); TQValueList langs; TQString pixmap = *sit; @@ -1070,7 +1070,7 @@ void LanguageOptions::loadCountryData() for (TQStringList::Iterator it = all_langs.begin(); it != all_langs.end(); ++it) { // Treat ie "en_GB" and "en_USE" as "en" because the language list - // only contains the first letters + // only tqcontains the first letters if ((*it).find("_")) *it = (*it).left((*it).find("_")); @@ -1126,7 +1126,7 @@ void LanguageOptions::loadCountryData() void LanguageOptions::slotLangFromGlobalActivated(int i) { - if (countryIdMap.contains(i)) + if (countryIdMap.tqcontains(i)) { Country c = countryIdMap[i]; bool first = true; @@ -1134,7 +1134,7 @@ void LanguageOptions::slotLangFromGlobalActivated(int i) { TQString s = global_langset.shortId(*it); - if (d_shortName->contains(s.stripWhiteSpace())) + if (d_shortName->tqcontains(s.stripWhiteSpace())) { if (first) { @@ -1223,7 +1223,7 @@ void LanguageOptions::slotLangFromISO6391Activated(int id) { TQString shortid = global_langset.shortId(id); - if (d_shortName->contains(shortid.stripWhiteSpace())) + if (d_shortName->tqcontains(shortid.stripWhiteSpace())) { d_shortName->setCurrentItem(shortid); slotShortActivated(shortid); diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui index 84698be7..b240d850 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui @@ -4,7 +4,7 @@ LanguageOptionsBase - + 0 0 @@ -93,7 +93,7 @@ - d_kblayout + d_kbtqlayout Select a language or use the Add New Language Code to add one. @@ -205,7 +205,7 @@ - label_kblayout + label_kbtqlayout @@ -216,10 +216,10 @@ - Keyboard layout: + Keyboard tqlayout: - d_kblayout + d_kbtqlayout You can assign a language to each column @@ -258,7 +258,7 @@ Obtains the language choices from the KDE database - Pressing this button opens a menu that contains all the countries that are known in your KDE installation. Ordered by country you can add your desired language properties to your personal list. + Pressing this button opens a menu that tqcontains all the countries that are known in your KDE installation. Ordered by country you can add your desired language properties to your personal list. @@ -275,7 +275,7 @@ List of languages covered by ISO639-1 - Pressing this button opens a menu that contains all the language codes that are covered by "ISO639-1" + Pressing this button opens a menu that tqcontains all the language codes that are covered by "ISO639-1" @@ -323,7 +323,7 @@ Expanding - + 390 20 @@ -337,14 +337,14 @@ e_shortName2 e_langLong b_langPixmap - d_kblayout + d_kbtqlayout b_langDel e_newName b_langNew b_lang_kde b_lang_iso1 - + kcombobox.h kcombobox.h diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp index ca79f2d5..32efc138 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp @@ -248,7 +248,7 @@ void PasteOptions::slotSyncPasteOrderList() } } - // order_list contains elements unknown in language set? remove them + // order_list tqcontains elements unknown in language set? remove them for (int i = (int) OrderList->count()-1; i >=0; i--) { if (!OrderList->text(i).isEmpty()) @@ -260,7 +260,7 @@ void PasteOptions::slotSyncPasteOrderList() } } - // language set contains new elements? append them + // language set tqcontains new elements? append them for (int i = 0; i < (int) m_langSet.size(); i++) { bool found = false; diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui index 3ee107fc..be30bac8 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui @@ -4,7 +4,7 @@ PasteOptionsBase - + 0 0 @@ -37,7 +37,7 @@ SeparatorCombo - + 140 0 @@ -60,7 +60,7 @@ Expanding - + 310 20 @@ -145,7 +145,7 @@ Expanding - + 21 21 @@ -164,7 +164,7 @@ Expanding - + 80 31 @@ -207,7 +207,7 @@ SkipButton DownButton - + kcombobox.h diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui index 24e70c58..3f3d14ed 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui @@ -4,7 +4,7 @@ QueryOptionsBase - + 0 0 @@ -242,7 +242,7 @@ Minimum - + 16 48 @@ -261,7 +261,7 @@ 0 - + 32767 32767 @@ -290,7 +290,7 @@ Expanding - + 111 20 @@ -309,7 +309,7 @@ Expanding - + 290 20 @@ -390,7 +390,7 @@ - layout3 + tqlayout3 @@ -439,7 +439,7 @@ Minimum - + 83 20 @@ -475,7 +475,7 @@ Expanding - + 200 16 @@ -563,7 +563,7 @@ kcfg_ShowMore kcfg_IKnow - + knuminput.h knuminput.h diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui index 4cf771c2..05df9d74 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui @@ -4,7 +4,7 @@ ThresholdOptionsBase - + 0 0 @@ -145,7 +145,7 @@ - layout8 + tqlayout8 @@ -209,7 +209,7 @@ Expanding - + 20 50 @@ -226,7 +226,7 @@ MinimumExpanding - + 20 80 @@ -285,7 +285,7 @@ Expanding - + 290 16 @@ -294,5 +294,5 @@ - + diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui index 3bb2af24..2dec0a3e 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui @@ -4,7 +4,7 @@ ViewOptionsBase - + 0 0 @@ -448,7 +448,7 @@ Expanding - + 61 20 @@ -520,7 +520,7 @@ kcolorbutton.h - + kfontrequester.h kfontrequester.h diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui index 137d3df5..63afd416 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui @@ -4,7 +4,7 @@ Document_options - + 0 0 @@ -54,5 +54,5 @@ - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui index cce69a3f..27fe6d39 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui @@ -4,7 +4,7 @@ LangPropPage - + 0 0 @@ -70,7 +70,7 @@ 0 - + 70 0 @@ -93,7 +93,7 @@ MinimumExpanding - + 20 20 @@ -225,7 +225,7 @@ Minimum - + 50 20 @@ -464,7 +464,7 @@ Minimum - + 50 20 @@ -588,5 +588,5 @@ thirdM_plural thirdN_plural - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp index d7015435..c7c14584 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp @@ -226,7 +226,7 @@ void LessOptPage::cleanUnused (kvoctrainDoc *doc, vector translate_index; ///////////////////////////////////////////////////// - // translate_index contains new index number for each + // translate_index tqcontains new index number for each // old index for (int i = 0; i <= QMAX (old_lessons, (int) lessonIndex.size()); i++) translate_index.push_back(0); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h index b5a54e06..0025b54c 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h @@ -70,7 +70,7 @@ protected slots: private: kvoctrainDoc *doc; int act_lesson; - vector lessonIndex; // contains indices of lesson on exec() + vector lessonIndex; // tqcontains indices of lesson on exec() // negative values are new lessons }; #endif // LessOptPage_included diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui index 311ab3bc..d0d8ba08 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui @@ -4,7 +4,7 @@ Lesson_Descriptions - + 0 0 @@ -52,7 +52,7 @@ Expanding - + 20 20 @@ -139,5 +139,5 @@ b_delete b_cleanup - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp index 00325b7b..aae596bb 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp @@ -237,7 +237,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector &tenseIndex, vector new_tenseStr; ///////////////////////////////////////////////////// - // translate_index contains new index number for each + // translate_index tqcontains new index number for each // old index for (int i = 0; i <= QMAX (old_tenses, (int) tenseIndex.size()); i++) translate_index.push_back(0); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h index 1cc3913b..53c08bc7 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h @@ -68,7 +68,7 @@ protected slots: private: kvoctrainDoc *doc; int act_tense; - vector tenseIndex; // contains indices of tenses on exec() + vector tenseIndex; // tqcontains indices of tenses on exec() // negative values are new tenses }; #endif // TenseOptPage_included diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui index b0471df8..3db0be2d 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui @@ -4,7 +4,7 @@ Tense_Descriptions - + 0 0 @@ -52,7 +52,7 @@ Expanding - + 20 20 @@ -139,5 +139,5 @@ b_delete b_cleanup - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui index b2a49e51..a355da67 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui @@ -4,7 +4,7 @@ TitlePage - + 0 0 @@ -109,7 +109,7 @@ Expanding - + 20 20 @@ -126,7 +126,7 @@ Expanding - + 20 20 @@ -182,5 +182,5 @@ e_license e_remark - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp index c89129b8..b500bf2a 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp @@ -228,7 +228,7 @@ void TypeOptPage::cleanUnused(kvoctrainDoc *doc, const vector &typeIndex, i vector new_typeStr; ///////////////////////////////////////////////////// - // translate_index contains new index number for each + // translate_index tqcontains new index number for each // old index for (int i = 0; i <= QMAX (old_types, (int) typeIndex.size()); i++) translate_index.push_back(0); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h index 68e50b26..f59fc37b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h @@ -66,7 +66,7 @@ protected slots: private: kvoctrainDoc *doc; int act_type; - vector typeIndex; // contains indices of types on exec() + vector typeIndex; // tqcontains indices of types on exec() // negative values are new lessons }; #endif // TypeOptPage_included diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui index f1735015..1b27973a 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui @@ -4,7 +4,7 @@ Type_Descriptions - + 0 0 @@ -52,7 +52,7 @@ Expanding - + 20 20 @@ -139,5 +139,5 @@ b_delete b_cleanup - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp index 96c4a093..c28e6d55 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp @@ -251,7 +251,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc, vector new_usageStr; ///////////////////////////////////////////////////// - // translate_index contains new index number for each + // translate_index tqcontains new index number for each // old index for (int i = 0; i <= QMAX (old_usages, (int) usageIndex.size()); i++) translate_index.push_back(0); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h index 8d669571..d8db70ff 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h @@ -68,7 +68,7 @@ protected slots: private: kvoctrainDoc *doc; int act_usage; - vector usageIndex; // contains indices of usages on exec() + vector usageIndex; // tqcontains indices of usages on exec() // negative values are new lessons }; #endif // UsageOptPage_included diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui index dbdf58fe..73571c94 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui @@ -4,7 +4,7 @@ Usage_Labels - + 0 0 @@ -52,7 +52,7 @@ Expanding - + 20 20 @@ -139,5 +139,5 @@ b_delete b_cleanup - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui index a2213edb..e599d674 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui @@ -4,7 +4,7 @@ AdjEntryPageForm - + 0 0 @@ -142,5 +142,5 @@ - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui index 632973bc..6e550b11 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui @@ -4,7 +4,7 @@ AuxInfoEntryPageForm - + 0 0 @@ -70,7 +70,7 @@ 0 - + 32767 80 @@ -89,7 +89,7 @@ 0 - + 32767 80 @@ -108,7 +108,7 @@ 0 - + 32767 80 @@ -182,7 +182,7 @@ 0 - + 32767 80 @@ -207,7 +207,7 @@ 0 - + 32767 80 @@ -225,5 +225,5 @@ remark_line para_line - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp index 9a7d44fb..daaed082 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp @@ -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); } } diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui index 5e67f8a4..cf8394ad 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui @@ -4,7 +4,7 @@ CommonEntryPageForm - + 0 0 @@ -165,13 +165,13 @@ 0 - + 30 0 - + 30 30 @@ -196,13 +196,13 @@ 0 - + 30 0 - + 30 30 @@ -257,7 +257,7 @@ Minimum - + 20 20 @@ -300,13 +300,13 @@ 0 - + 30 0 - + 30 30 @@ -358,13 +358,13 @@ 0 - + 30 0 - + 30 24 @@ -387,7 +387,7 @@ Preferred - + 20 20 @@ -406,7 +406,7 @@ 0 - + 32767 90 @@ -428,7 +428,7 @@ 0 - + 0 80 @@ -440,7 +440,7 @@ Sunken - + WordBreak|AlignTop|AlignLeft @@ -475,5 +475,5 @@ b_usageDlg c_active - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h index 9850e107..d9d22c67 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h @@ -135,7 +135,7 @@ 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 fromQCountDirty () 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; } @@ -146,7 +146,7 @@ public: 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 toQCountDirty () 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; } diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h index 238f4462..8162ee3b 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h @@ -66,7 +66,7 @@ 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; diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui index 9fea8f70..d4a1faa7 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui @@ -4,7 +4,7 @@ FromToEntryPageForm - + 0 0 @@ -72,7 +72,7 @@ Expanding - + 20 20 @@ -150,7 +150,7 @@ year_spin - + 60 0 @@ -161,7 +161,7 @@ month_spin - + 110 0 @@ -172,7 +172,7 @@ day_spin - + 60 0 @@ -189,7 +189,7 @@ Expanding - + 20 20 @@ -316,5 +316,5 @@ qcount_line bcount_line - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui index b03b2de6..488f5234 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui @@ -4,7 +4,7 @@ MCEntryPageForm - + 0 0 @@ -213,5 +213,5 @@ mc4Field mc5Field - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index 47487624..11865aee 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("")}, @@ -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) { - 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,12 +191,12 @@ 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)); + butt->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); int sz = QMAX(14, int(1.7*ipafont.pointSize())); butt->setMaximumSize(TQSize (sz, sz)); gbox->addWidget( butt, vert, horiz, AlignCenter ); @@ -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/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui index 1c3c4ee5..882884f1 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui @@ -4,7 +4,7 @@ TenseEntryPageForm - + 0 0 @@ -44,7 +44,7 @@ - layout3 + tqlayout3 @@ -229,7 +229,7 @@ Fixed - + 80 20 @@ -307,7 +307,7 @@ - layout5 + tqlayout5 @@ -383,5 +383,5 @@ thirdM_plural thirdN_plural - + diff --git a/kvoctrain/kvoctrain/kv_resource.h b/kvoctrain/kvoctrain/kv_resource.h index 6f704913..76ddc776 100644 --- a/kvoctrain/kvoctrain/kv_resource.h +++ b/kvoctrain/kvoctrain/kv_resource.h @@ -35,7 +35,7 @@ #include /////////////////////////////////////////////////////////////////// -// kv_resource.h -- contains macros used for commands +// kv_resource.h -- tqcontains macros used for commands #define KV_EXTRA_COLS 2 // add col for lesson number #define KV_COL_LESS 0 // col: lesson number diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp index d441cc2e..9a1d5c72 100644 --- a/kvoctrain/kvoctrain/kva_clip.cpp +++ b/kvoctrain/kvoctrain/kva_clip.cpp @@ -112,7 +112,7 @@ vector kvoctrainApp::getCsvOrder(kvoctrainDoc *doc) void kvoctrainApp::slotEditCopy() { - slotStatusMsg(i18n("Copying selection to clipboard...")); + slotqStatusMsg(i18n("Copying selection to clipboard...")); TQApplication::setOverrideCursor( waitCursor ); TQString exp; @@ -157,13 +157,13 @@ void kvoctrainApp::slotEditCopy() } TQApplication::restoreOverrideCursor(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotEditPaste() { - slotStatusMsg(i18n("Inserting clipboard contents...")); + slotqStatusMsg(i18n("Inserting clipboard contents...")); TQApplication::setOverrideCursor( waitCursor ); TQString s; @@ -228,7 +228,7 @@ void kvoctrainApp::slotEditPaste() } TQApplication::restoreOverrideCursor(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp index d1572659..4ce0f6c5 100644 --- a/kvoctrain/kvoctrain/kva_header.cpp +++ b/kvoctrain/kvoctrain/kva_header.cpp @@ -53,7 +53,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM); connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); header_m->exec(TQPoint (x, y)); return; @@ -90,7 +90,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ (header << 16) | (i << (16+8)) | IDH_SET_LANG); } connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int))); - connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); header_m = new TQPopupMenu(); @@ -143,7 +143,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ } header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL); connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available int j; @@ -168,7 +168,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE); header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE); connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); header_m->insertSeparator(); header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA); @@ -176,7 +176,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ } connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); header_m->exec(TQPoint(x, y)); } @@ -222,11 +222,11 @@ void kvoctrainApp::slotSetHeaderProp (int header_and_id) /*FOLD00*/ } */ doc->setModified(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } -void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ +void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ { int header1 = (header_and_cmd >> 16) & 0xFF; int header2 = header_and_cmd >> (16+8); @@ -239,19 +239,19 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ break; case ID_RESUME_QUERY: - slotStatusHelpMsg(i18n("Resumes random query with existing selection")); + slotqStatusHelpMsg(i18n("Resumes random query with existing selection")); break; case ID_RESUME_MULTIPLE: - slotStatusHelpMsg(i18n("Resumes multiple choice with existing selection")); + slotqStatusHelpMsg(i18n("Resumes multiple choice with existing selection")); break; case IDH_SORT_COL_ALPHA: - slotStatusHelpMsg(i18n("Sorts column alphabetically up/down")); + slotqStatusHelpMsg(i18n("Sorts column alphabetically up/down")); break; case IDH_SORT_COL_NUM: - slotStatusHelpMsg(i18n("Sorts column by lesson index up/down")); + slotqStatusHelpMsg(i18n("Sorts column by lesson index up/down")); break; case IDH_SET_LANG: { @@ -268,7 +268,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ TQString format = i18n("Sets %1 as language for translation %2"); msg = format.arg(from).arg(header1); } - slotStatusHelpMsg(msg); + slotqStatusHelpMsg(msg); } break; @@ -277,13 +277,13 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ TQString msg; if (header1 == 0xFF) { msg = i18n("Appends a new language"); - slotStatusHelpMsg(msg); + slotqStatusHelpMsg(msg); } else if (header1 < (int) langset.size() ) { TQString from = langset.longId(header1); TQString format = i18n("Appends %1 as new language"); msg = format.arg(from); - slotStatusHelpMsg(msg); + slotqStatusHelpMsg(msg); } } break; @@ -295,7 +295,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ TQString msg; TQString format = i18n("Removes %1 irrevocably from dictionary"); msg = format.arg(from); - slotStatusHelpMsg(msg); + slotqStatusHelpMsg(msg); } break; @@ -327,47 +327,47 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ msg = format.arg(from).arg(to); } - slotStatusHelpMsg(msg); + slotqStatusHelpMsg(msg); } break; case IDH_START_VERB: { - slotStatusHelpMsg(i18n("Starts training with verbs")); + slotqStatusHelpMsg(i18n("Starts training with verbs")); } break; case IDH_START_ARTICLE: { - slotStatusHelpMsg(i18n("Starts training with articles")); + slotqStatusHelpMsg(i18n("Starts training with articles")); } break; case IDH_START_ADJECTIVE: { - slotStatusHelpMsg(i18n("Starts training with adjectives")); + slotqStatusHelpMsg(i18n("Starts training with adjectives")); } break; case IDH_START_SYNONYM: { - slotStatusHelpMsg(i18n("Starts training with synonyms")); + slotqStatusHelpMsg(i18n("Starts training with synonyms")); } break; case IDH_START_ANTONYM: { - slotStatusHelpMsg(i18n("Starts training with antonyms")); + slotqStatusHelpMsg(i18n("Starts training with antonyms")); } break; case IDH_START_EXAMPLE: { - slotStatusHelpMsg(i18n("Starts training with examples")); + slotqStatusHelpMsg(i18n("Starts training with examples")); } break; case IDH_START_PARAPHRASE: { - slotStatusHelpMsg(i18n("Starts training with paraphrases")); + slotqStatusHelpMsg(i18n("Starts training with paraphrases")); } break; case IDH_CREATE_LESSON: { - slotStatusHelpMsg(i18n("Creates lesson")); + slotqStatusHelpMsg(i18n("Creates lesson")); } break; @@ -377,12 +377,12 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ from = langset.findLongId(from); TQString format = i18n("Resets all properties for %1"); TQString msg = format.arg(from); - slotStatusHelpMsg(msg); + slotqStatusHelpMsg(msg); } break; default: - kdError() << "kvoctrainApp::slotHeaderStatus: got unknown command :" << cmd << endl; + kdError() << "kvoctrainApp::slotHeadertqStatus: got unknown command :" << cmd << endl; } } @@ -564,7 +564,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ kdError() << "kvoctrainApp::slotHeaderCallBack: got unknown command\n"; } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index c1b3ebe8..c1f1cb49 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -187,7 +187,7 @@ void kvoctrainApp::initActions() vocabAppendLanguage = new KSelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language"); connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabAppendLanguage())); connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAppendLang(int))); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); vocabSetLanguage = new KSelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language"); connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabSetLanguage())); @@ -195,7 +195,7 @@ void kvoctrainApp::initActions() vocabRemoveLanguage = new KSelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language"); connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabRemoveLanguage())); connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, this, TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); vocabDocumentProperties->setWhatsThis(i18n("Edit document properties")); @@ -241,11 +241,11 @@ void kvoctrainApp::initActions() configQueryOptions->setToolTip(configQueryOptions->whatsThis());*/ actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusHelpMsg(const TQString &))); + connect(actionCollection(), TQT_SIGNAL(actiontqStatusText(const TQString &)), this, TQT_SLOT(slotqStatusHelpMsg(const TQString &))); //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool))); if (!initialGeometrySet()) - resize( TQSize(550, 400).expandedTo(minimumSizeHint())); + resize( TQSize(550, 400).expandedTo(tqminimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); @@ -255,7 +255,7 @@ void kvoctrainApp::initActions() learn_menu = (TQPopupMenu*) child( "learning", "KPopupMenu" ); connect(learn_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn())); } @@ -296,5 +296,5 @@ void kvoctrainApp::initView() { view = new kvoctrainView(doc, langset, this); setCentralWidget(view); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index c809cc3a..9b282c9e 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -61,12 +61,12 @@ static const char *PATTERN_VCB = I18N_NOOP("*.vocab|Vocabbox (*.vocab)\n"); void kvoctrainApp::slotTimeOutBackup() { if (Prefs::autoBackup() && doc && doc->isModified() ) { - slotStatusMsg(i18n("Autobackup in progress")); + slotqStatusMsg(i18n("Autobackup in progress")); slotFileSave(); } if (Prefs::backupTime() > 0) btimer->start(Prefs::backupTime() * 60 * 1000, TRUE); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -126,7 +126,7 @@ void kvoctrainApp::slotFileQuit() kapp->quit(); } else - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -142,19 +142,19 @@ void kvoctrainApp::slotProgress(kvoctrainDoc *curr_doc, int percent) void kvoctrainApp::slotFileOpenRecent(const KURL& url) { - slotStatusMsg(i18n("Opening file...")); + slotqStatusMsg(i18n("Opening file...")); if (queryExit() && fileOpenRecent->items().count() > 0) { fileOpenRecent->setCurrentItem(-1); loadfileFromPath(url); } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotFileNew() { - slotStatusMsg(i18n("Creating new file...")); + slotqStatusMsg(i18n("Creating new file...")); if (queryExit() ) { view->setView (0, langset); @@ -172,20 +172,20 @@ void kvoctrainApp::slotFileNew() connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotFileOpen() { - slotStatusMsg(i18n("Opening file...")); + slotqStatusMsg(i18n("Opening file...")); if (queryExit() ) { TQString s; - KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Open Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, tqparentWidget(), i18n("Open Vocabulary File")); loadfileFromPath(url, true); } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -200,7 +200,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) TQString format = i18n("Loading %1"); TQString msg = format.arg(url.path()); - slotStatusMsg(msg); + slotqStatusMsg(msg); prepareProgressBar(); doc = new kvoctrainDoc (this, url); removeProgressBar(); @@ -217,17 +217,17 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) void kvoctrainApp::slotFileOpenExample() { - slotStatusMsg(i18n("Opening example file...")); + slotqStatusMsg(i18n("Opening example file...")); if (queryExit() ) { TQString s; s = locate("data", "kvoctrain/examples/"); - KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, parentWidget(), i18n("Open Example Vocabulary File")); + KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, tqparentWidget(), i18n("Open Example Vocabulary File")); loadfileFromPath(url, false); if (doc) doc->URL().setFileName(TQString::null); } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -241,17 +241,17 @@ void kvoctrainApp::slotGHNS() void kvoctrainApp::slotFileMerge() { - slotStatusMsg(i18n("Merging file...")); + slotqStatusMsg(i18n("Merging file...")); TQString s; - KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Merge Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, tqparentWidget(), i18n("Merge Vocabulary File")); if (!url.isEmpty() ) { TQString format = i18n("Loading %1"); TQString msg = format.arg(url.path()); - slotStatusMsg(msg); + slotqStatusMsg(msg); prepareProgressBar(); kvoctrainDoc *new_doc = new kvoctrainDoc (this, url); connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); @@ -275,7 +275,7 @@ void kvoctrainApp::slotFileMerge() format = i18n("Merging %1"); msg = format.arg(url.path()); - slotStatusMsg(msg); + slotqStatusMsg(msg); TQApplication::setOverrideCursor( waitCursor ); @@ -485,7 +485,7 @@ void kvoctrainApp::slotFileMerge() view->getTable()->setFont(Prefs::tableFont()); view->adjustContent(); TQApplication::restoreOverrideCursor(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -501,7 +501,7 @@ void kvoctrainApp::slotFileSave() TQString format = i18n("Saving %1"); TQString msg = format.arg(doc->URL().path()); - slotStatusMsg(msg); + slotqStatusMsg(msg); // remove previous backup TQFile::remove(TQFile::encodeName(doc->URL().path()+"~")); @@ -514,7 +514,7 @@ void kvoctrainApp::slotFileSave() fileOpenRecent->addURL(doc->URL()); removeProgressBar(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -587,12 +587,12 @@ void kvoctrainApp::saveDocProps(kvoctrainDoc *the_doc) void kvoctrainApp::slotFileSaveAs() { - slotStatusMsg(i18n("Saving file under new filename...")); + slotqStatusMsg(i18n("Saving file under new filename...")); if (entryDlg != 0) commitEntryDlg(false); - KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); if (!url.isEmpty() ) { TQFileInfo fileinfo(url.path()); @@ -607,7 +607,7 @@ void kvoctrainApp::slotFileSaveAs() if (doc) { TQString format = i18n("Saving %1"); TQString msg = format.arg(url.path()); - slotStatusMsg(msg); + slotqStatusMsg(msg); TQFile::remove(TQFile::encodeName(url.path()+"~")); // remove previous backup ::rename (TQFile::encodeName(url.path()), TQFile::encodeName(TQString(url.path()+"~"))); @@ -619,7 +619,7 @@ void kvoctrainApp::slotFileSaveAs() removeProgressBar(); } } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -628,7 +628,7 @@ void kvoctrainApp::slotSaveSelection () if (entryDlg != 0) commitEntryDlg(false); - slotStatusMsg(i18n("Saving selected area under new filename...")); + slotqStatusMsg(i18n("Saving selected area under new filename...")); TQString save_separator = Prefs::separator(); Prefs::setSeparator("\t"); kvoctrainDoc seldoc(this, ""); @@ -644,7 +644,7 @@ void kvoctrainApp::slotSaveSelection () if (doc->getEntry(i)->isInQuery() ) seldoc.appendEntry(doc->getEntry(i)); - KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); if (!url.isEmpty() ) { @@ -659,7 +659,7 @@ void kvoctrainApp::slotSaveSelection () { TQString format = i18n("Saving %1"); TQString msg = format.arg(url.path()); - slotStatusMsg(msg); + slotqStatusMsg(msg); TQFile::remove(url.path()+"~"); // remove previous backup // FIXME: check error @@ -672,7 +672,7 @@ void kvoctrainApp::slotSaveSelection () } } Prefs::setSeparator(save_separator); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp index 0f2ca08d..3a90f66e 100644 --- a/kvoctrain/kvoctrain/kva_query.cpp +++ b/kvoctrain/kvoctrain/kva_query.cpp @@ -115,7 +115,7 @@ void kvoctrainApp::slotQueryOptions(int pageindex) querymanager.setLessonItems(qodlg.getQueryManager().lessonItems() ); } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } } @@ -123,7 +123,7 @@ void kvoctrainApp::slotQueryOptions(int pageindex) void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property) { removeEntryDlg(); - slotStatusMsg(i18n("Starting property query...")); + slotqStatusMsg(i18n("Starting property query...")); queryType = property; querymode = false; num_queryTimeout = 0; @@ -187,7 +187,7 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property) simpleQueryDlg->initFocus(); simpleQueryDlg->show(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -288,14 +288,14 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res) doc); simpleQueryDlg->initFocus(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) { removeEntryDlg(); - slotStatusMsg(i18n("Starting special query...")); + slotqStatusMsg(i18n("Starting special query...")); querymode = false; num_queryTimeout = 0; act_query_col = col; @@ -399,7 +399,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) slotStopQuery(true); return; } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -544,7 +544,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res) slotStopQuery(true); return; } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -561,7 +561,7 @@ void kvoctrainApp::slotRestartQuery() void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & orglang, bool create_new) { removeEntryDlg(); - slotStatusMsg(i18n("Starting random query...")); + slotqStatusMsg(i18n("Starting random query...")); querymode = false; num_queryTimeout = 0; @@ -672,7 +672,7 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o slotStopQuery(true); return; } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -993,7 +993,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res) doc); mcQueryDlg->initFocus(); } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index 62d2e901..989b967e 100644 --- a/kvoctrain/kvoctrain/kvoctrain.cpp +++ b/kvoctrain/kvoctrain/kvoctrain.cpp @@ -178,7 +178,7 @@ void kvoctrainApp::commitEntryDlg(bool force) if (!force && entryDlg->isModified() && !Prefs::autoEntryApply()) { if( KMessageBox::No == KMessageBox::warningYesNo(this, - i18n("The entry dialog contains unsaved changes.\n" + i18n("The entry dialog tqcontains unsaved changes.\n" "Do you want to apply or discard your changes?"), kapp->makeStdCaption(i18n("Unsaved Changes")), KStdGuiItem::apply(), KStdGuiItem::discard())) { @@ -615,7 +615,7 @@ void kvoctrainApp::slotDocProps () doc->setLicense(ddlg.getLicense() ); doc->setDocRemark(ddlg.getDocRemark() ); - slotStatusMsg(i18n("Updating lesson indices...")); + slotqStatusMsg(i18n("Updating lesson indices...")); TQApplication::setOverrideCursor( waitCursor ); ddlg.getLesson(lessons, lessonIndex); @@ -628,15 +628,15 @@ void kvoctrainApp::slotDocProps () for (int i = 1; i < lessons->count(); i++) new_lessonStr.push_back(lessons->text(i)); - slotStatusMsg(i18n("Updating type indices...")); + slotqStatusMsg(i18n("Updating type indices...")); TypeOptPage::cleanUnused(doc, typeIndex, old_types); QueryManager::setTypeNames (new_typeStr); - slotStatusMsg(i18n("Updating tense indices...")); + slotqStatusMsg(i18n("Updating tense indices...")); TenseOptPage::cleanUnused(doc, tenseIndex, old_tenses); Conjugation::setTenseNames (new_tenseStr); - slotStatusMsg(i18n("usage (area) of an expression", + slotqStatusMsg(i18n("usage (area) of an expression", "Updating usage label indices...")); UsageOptPage::cleanUnused(doc, usageIndex, old_usages); UsageManager::setUsageNames (new_usageStr); @@ -654,7 +654,7 @@ void kvoctrainApp::slotDocProps () setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); TQApplication::restoreOverrideCursor(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } } @@ -674,7 +674,7 @@ void kvoctrainApp::slotDocPropsLang () view->getTable()->updateContents(); setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } } @@ -682,7 +682,7 @@ void kvoctrainApp::slotDocPropsLang () void kvoctrainApp::slotModifiedDoc(bool mod) { setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -831,7 +831,7 @@ void kvoctrainApp::keyPressEvent( TQKeyEvent *e ) if (!found) e->ignore(); } - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -885,7 +885,7 @@ void kvoctrainApp::slotCleanVocabulary () TQApplication::restoreOverrideCursor(); removeProgressBar(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); if (num != 0) { view->setView(doc, langset); @@ -910,7 +910,7 @@ void kvoctrainApp::slotCreateRandom() Prefs::setEntriesPerLesson(res); - slotStatusMsg(i18n("Creating random lessons...")); + slotqStatusMsg(i18n("Creating random lessons...")); TQApplication::setOverrideCursor( waitCursor ); vector randomList; @@ -948,7 +948,7 @@ void kvoctrainApp::slotCreateRandom() doc->setModified (); } TQApplication::restoreOverrideCursor(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } @@ -1047,7 +1047,7 @@ void kvoctrainApp::slotResumeSearch(const TQString& s) return; } - slotStatusMsg(i18n("Searching expression...")); + slotqStatusMsg(i18n("Searching expression...")); TQApplication::setOverrideCursor( waitCursor ); // new word or shortend word @@ -1076,11 +1076,11 @@ void kvoctrainApp::slotResumeSearch(const TQString& s) searchstr = s; TQApplication::restoreOverrideCursor(); - slotStatusMsg(IDS_DEFAULT); + slotqStatusMsg(IDS_DEFAULT); } -void kvoctrainApp::slotStatusMsg(const TQString &/*text*/) +void kvoctrainApp::slotqStatusMsg(const TQString &/*text*/) { // } @@ -1150,7 +1150,7 @@ void kvoctrainApp::aboutToShowLearn() header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL); connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available @@ -1178,11 +1178,11 @@ void kvoctrainApp::aboutToShowLearn() header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE); connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); } connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); TQString id = header == 0 ? doc->getOriginalIdent() : doc->getIdent(header); @@ -1264,7 +1264,7 @@ void kvoctrainApp::aboutToShowVocabSetLanguage() } connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int))); - connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); if (header == 0) set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL); @@ -1311,7 +1311,7 @@ void kvoctrainApp::aboutToShowVocabRemoveLanguage() } -void kvoctrainApp::slotStatusHelpMsg(const TQString &text) +void kvoctrainApp::slotqStatusHelpMsg(const TQString &text) { /////////////////////////////////////////////////////////////////// // change status message of whole statusbar temporary (text, msec) @@ -1321,7 +1321,7 @@ void kvoctrainApp::slotStatusHelpMsg(const TQString &text) void kvoctrainApp::slotFilePrint() { - slotStatusMsg(i18n("Printing...")); + slotqStatusMsg(i18n("Printing...")); KPrinter printer; printer.setFullPage(true); if (printer.setup(this)) @@ -1329,7 +1329,7 @@ void kvoctrainApp::slotFilePrint() view->print(&printer); } - slotStatusMsg(i18n("Ready")); + slotqStatusMsg(i18n("Ready")); } #include "kvoctrain.moc" diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h index a1be3c54..b19b0d0a 100644 --- a/kvoctrain/kvoctrain/kvoctrain.h +++ b/kvoctrain/kvoctrain/kvoctrain.h @@ -145,7 +145,7 @@ public: // void slotSearchClip(); void slotSetHeaderProp (int header_and_id); void slotHeaderCallBack (int cmd_and_id); - void slotHeaderStatus (int cmd_and_id); + void slotHeadertqStatus (int cmd_and_id); void slotHeaderMenu(int header, int x, int y); /** append language to table */ void slotAppendLang(int header); @@ -215,9 +215,9 @@ public: void slotEditPaste(); /** change the status message to text */ - void slotStatusMsg(const TQString &text); + void slotqStatusMsg(const TQString &text); /** change the status message of the whole statusbar temporary */ - void slotStatusHelpMsg(const TQString &text); + void slotqStatusHelpMsg(const TQString &text); public: void removeProgressBar(); diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index 7dc54b45..bb40512a 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -76,7 +76,7 @@ void KVocTrainTable::setCurrentItem(int row) setCurrentRow(row, currentColumn()); } /* -TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace) +TQWidget* KVocTrainTable::beginEdit(int row, int col, bool tqreplace) { if (KApplication::dcopClient()->isApplicationRegistered("kxkb")) { @@ -103,12 +103,12 @@ TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace) } } } - return TQTable::beginEdit(row, col, replace); + return TQTable::beginEdit(row, col, tqreplace); } -void KVocTrainTable::endEdit(int row, int col, bool accept, bool replace) +void KVocTrainTable::endEdit(int row, int col, bool accept, bool tqreplace) { - TQTable::endEdit(row, col, accept, replace); + TQTable::endEdit(row, col, accept, tqreplace); } */ void KVocTrainTable::sortByColumn(int header, bool alpha) { @@ -141,7 +141,7 @@ void KVocTrainTable::sortByColumn(int header, bool alpha) { sortdir = m_doc->sortByLesson_index(); } horizontalHeader()->setSortIndicator(header, sortdir); - repaintContents(); + tqrepaintContents(); m_doc->setModified(); emit currentChanged(currentRow(), currentColumn()); TQApplication::restoreOverrideCursor(); @@ -424,10 +424,10 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c } TQPen pen( p->pen() ); - int gridColor = style().styleHint( TQStyle::SH_Table_GridLineColor, this ); + int gridColor = style().tqstyleHint( TQStyle::SH_Table_GridLineColor, this ); if (gridColor != -1) { const TQPalette &pal = palette(); - if (cg != colorGroup() + if (cg != tqcolorGroup() && cg != pal.disabled() && cg != pal.inactive()) p->setPen(cg.mid()); diff --git a/kvoctrain/kvoctrain/kvoctraintable.h b/kvoctrain/kvoctrain/kvoctraintable.h index 77fffa77..9d2cc779 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.h +++ b/kvoctrain/kvoctrain/kvoctraintable.h @@ -80,8 +80,8 @@ public: protected: int current; - //TQWidget* beginEdit(int row, int col, bool replace); - //void endEdit(int row, int col, bool accept, bool replace); + //TQWidget* beginEdit(int row, int col, bool tqreplace); + //void endEdit(int row, int col, bool accept, bool tqreplace); void paintCell(TQPainter *p, int row, int col, const TQRect &cr, bool selected, const TQColorGroup &cg); void setItem(int row, int col, TQTableItem * item); TQTableItem* item (int row, int col) const; diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp index f4aefca8..89bcdf52 100644 --- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp +++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp @@ -36,7 +36,7 @@ KVocTrainTableItem::KVocTrainTableItem( TQTable *t, EditType et, kvoctrainDoc *d : TQTableItem( t, et, TQString::null ) { m_doc = doc; - // we do not want that this item can be replaced + // we do not want that this item can be tqreplaced setReplaceable(false); } @@ -75,7 +75,7 @@ TQWidget *KVocTrainTableItem::createEditor() const statebox->insertItem (i18n("state of a row", "Active, Not in Query")); statebox->insertItem (i18n("state of a row", "In Query")); statebox->insertItem (i18n("state of a row", "Inactive")); - TQSize sz = statebox->sizeHint(); + TQSize sz = statebox->tqsizeHint(); sz.setHeight(table()->rowHeight(row())); statebox->setMinimumSize(sz); if (!m_doc->getEntry(row())->isActive() ) diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp index ebad99ee..e7d9ad56 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.cpp +++ b/kvoctrain/kvoctrain/kvoctrainview.cpp @@ -67,10 +67,10 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQT_SLOT(keyPressEvent(TQKeyEvent *))); connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *))); - list_layout = new TQGridLayout( this, 2, 1/*, 4 */); - list_layout->addWidget(m_table, 1, 0); - list_layout->setRowStretch(1, 1); - list_layout->activate(); + list_tqlayout = new TQGridLayout( this, 2, 1/*, 4 */); + list_tqlayout->addWidget(m_table, 1, 0); + list_tqlayout->setRowStretch(1, 1); + list_tqlayout->activate(); setView(m_doc, ls); } @@ -243,21 +243,21 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString int h = pix.height(); TQPixmap arrow(w + 14, h); - TQBitmap mask(arrow.width(), arrow.height()); + TQBitmap tqmask(arrow.width(), arrow.height()); arrow.fill(Qt::white); - mask.fill(Qt::black); + tqmask.fill(Qt::black); bitBlt(&arrow, 0, 0, &pix, 0, 0); - if (pix.mask() != 0) - bitBlt(&mask, 0, 0, pix.mask(), 0, 0); + if (pix.tqmask() != 0) + bitBlt(&tqmask, 0, 0, pix.tqmask(), 0, 0); else { TQBitmap bmp(pix.createHeuristicMask()); - bitBlt(&mask, 0, 0, &bmp, 0, 0); + bitBlt(&tqmask, 0, 0, &bmp, 0, 0); } TQPainter p, pm; p.begin(&arrow); - pm.begin(&mask); + pm.begin(&tqmask); p.setPen(TQColor(0, 0, 0)); p.drawLine(w + 5, h - 2, w + 5 + 1, h - 2); @@ -275,7 +275,7 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString pm.end(); p.end(); - arrow.setMask(mask); + arrow.setMask(tqmask); TQIconSet set(arrow, TQIconSet::Small); header->setLabel(id, set, name); diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h index f76e240e..c5d46f10 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.h +++ b/kvoctrain/kvoctrain/kvoctrainview.h @@ -76,7 +76,7 @@ protected: KVocTrainTable * m_table; bool autoResize; kvoctrainDoc * m_doc; - TQGridLayout * list_layout; + TQGridLayout * list_tqlayout; kvoctrainApp * parent; /** resizes table when frame is resized */ diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp index 9180d6e4..f1161025 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp @@ -135,7 +135,7 @@ vector UsageManager::getRelation () } -bool UsageManager::contains (const TQString& label, const TQString& collection) +bool UsageManager::tqcontains (const TQString& label, const TQString& collection) { TQString s = collection; int pos; diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h index 647de685..dcbb2ae5 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h @@ -114,7 +114,7 @@ class UsageManager UsageManager (); - static bool contains (const TQString& label, const TQString& collection); + static bool tqcontains (const TQString& label, const TQString& collection); static vector getRelation (); static void setUsageNames (vector names); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp index e4906935..8d72ee87 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp @@ -138,42 +138,42 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is) // autodetect utf8 if (!utf8_mode) { for (int i = 0; !utf8_mode && i < (int) s.length(); ++i) { - ushort trigger = s[i].unicode(); + ushort trigger = s[i].tqunicode(); if (trigger >= 0x80) { int remain = s.length() - i; if ((trigger & 0xE0) == 0xC0){ // 110x xxxx if ( (remain > 1) - && (s[i+1].unicode() & 0xC0) == 0x80) + && (s[i+1].tqunicode() & 0xC0) == 0x80) utf8_mode = true; } else if ((trigger & 0xF0) == 0xE0) { // 1110 xxxx if ( remain > 2 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xF8) == 0xF0) { // 1111 0xxx if ( remain > 3 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80 - && s[i+3].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80 + && s[i+3].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFC) == 0xF8) { // 1111 10xx if ( remain > 4 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80 - && s[i+3].unicode() & 0xC0 == 0x80 - && s[i+4].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80 + && s[i+3].tqunicode() & 0xC0 == 0x80 + && s[i+4].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFE) == 0xFC) { // 1111 110x if ( remain > 5 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80 - && s[i+3].unicode() & 0xC0 == 0x80 - && s[i+4].unicode() & 0xC0 == 0x80 - && s[i+5].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80 + && s[i+3].tqunicode() & 0xC0 == 0x80 + && s[i+4].tqunicode() & 0xC0 == 0x80 + && s[i+5].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp index f07e906d..3d635cfe 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp @@ -827,7 +827,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name, TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); TQString format = i18n( - "Your document contains an unknown attribute <%1> " // keep trailing space + "Your document tqcontains an unknown attribute <%1> " // keep trailing space "in tag <%2>.\n" "Maybe your version of KVocTrain is too old, " "or the document is damaged.\n" @@ -851,7 +851,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem ) TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); TQString format = i18n( - "Your document contains an unknown tag <%1>. " // keep trailing space + "Your document tqcontains an unknown tag <%1>. " // keep trailing space "Maybe your version of KVocTrain is too old, " "or the document is damaged.\n" "Loading is aborted because KVocTrain cannot " diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp index 7cce072b..5b8e229f 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp @@ -96,7 +96,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is) while (c < 2) { temp = is.readLine(); - c+= temp.contains("\","); + c+= temp.tqcontains("\","); expression.append(temp); if (c < 2) expression.append(" "); diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h index 365882c6..c0c48055 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h @@ -45,7 +45,7 @@ #define CFG_FFAMILY "FontFamily" #define CFG_FCHARSET "FontCharSet" #define CFG_SHOW_TOOLBAR "ShowToolbar" -#define CFG_SHOW_STATUSBAR "ShowStatusbar" +#define CFG_SHOW_STATUSBAR "ShowtqStatusbar" #define CFG_TOOLBAR_POS "ToolBar_Pos" #define CFG_GENERAL "General" diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp index a10aa28a..8a03fa96 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp @@ -920,7 +920,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename) TQDataStream is( &f ); - Q_INT8 c1, c2, c3, c4, c5; + TQ_INT8 c1, c2, c3, c4, c5; is >> c1 >> c2 >> c3 @@ -949,7 +949,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename) if (line == LEX_IDENT_50) return vt_lex; - if (c1 == '"' && (line.contains('"') == 1 || line.contains(TQRegExp("\",[0-9]")))) + if (c1 == '"' && (line.tqcontains('"') == 1 || line.tqcontains(TQRegExp("\",[0-9]")))) return vt_voc; return csv; diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h index c331aac0..c44abf72 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h @@ -237,7 +237,7 @@ #define KV_CON_P3PF "p3f" // 3. person plural female #define KV_CON_P3PM "p3m" // 3. person plural male #define KV_CON_P3PN "p3n" // 3. person plural natural -#define KV_CONJ_COMMON "common" // female contains common for all three +#define KV_CONJ_COMMON "common" // female tqcontains common for all three #define LEX_IDENT_50 "Vocabulary Trainer V5.0" @@ -247,7 +247,7 @@ class TQStringList; class MultipleChoice; /************************************************************* - * This class contains the expressions of your vocabulary + * This class tqcontains the expressions of your vocabulary ************************************************************/ class kvoctrainDoc : public QObject diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h index f31cd1e9..490a498b 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h @@ -67,7 +67,7 @@ typedef signed char grade_t; typedef unsigned short count_t; /*************************************************************** - * This class contains one expression as original or in one + * This class tqcontains one expression as original or in one * translations **************************************************************/ diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h index 2c95a515..c9664f2c 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h @@ -23,7 +23,7 @@ using namespace std; class KOXML_OSTREAM; /** * The XMLWriter class provides support for writing XML streams. - * It contains methods for output XML elements with attributes. + * It tqcontains methods for output XML elements with attributes. * * Sample code: * 
@@ -32,8 +32,8 @@ class KOXML_OSTREAM;
  *
  *  xml.startTag ("head"); // writes <head>
  *
- *  // write <layout format="a4" orientation="landscape">
- *  xml.startTag ("layout", false);
+ *  // write <tqlayout format="a4" orientation="landscape">
+ *  xml.startTag ("tqlayout", false);
  *  xml.addAttribute ("format", "a4");
  *  xml.addAttribute ("orientation", "landscape");
  *  xml.closeTag (true);
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp
index 633e6f59..19f6108a 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/langset.cpp
@@ -212,9 +212,9 @@ void LangSet::setPixMapFile (const TQString & s, int index)
     langs[index].PixMapFile = s;
 }
 
-void LangSet::setKeyboardLayout(const TQString& layout, int index)
+void LangSet::setKeyboardLayout(const TQString& tqlayout, int index)
 {
   if (index < (int) langs.size()) {
-    langs[index].keyboardLayout = layout;
+    langs[index].keyboardLayout = tqlayout;
   }
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h
index 526f330d..39886b15 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.h
+++ b/kvoctrain/kvoctrain/kvt-core/langset.h
@@ -64,13 +64,13 @@ class LangSet
    int indexShortId (TQString shortId) const;
    int indexLongId (TQString longId) const;
    int indexPixMapFile (TQString PixMapFile) const;
-   // doesn't make sense for keyboard layouts since there is no 1-to-1 relation to languages
+   // doesn't make sense for keyboard tqlayouts since there is no 1-to-1 relation to languages
 
    void setShortId (const TQString & shortId, int index);
    void setShortId2 (const TQString & shortId2, int index);
    void setLongId (const TQString & longId, int index);
    void setPixMapFile (const TQString & PixMapFile, int index);
-   void setKeyboardLayout(const TQString & layout, int index);
+   void setKeyboardLayout(const TQString & tqlayout, int index);
 
    TQString findShortId (const TQString & longId)  const;
    TQString findLongId  (const TQString & shortId) const;
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp
index 2714cf76..c9e86e02 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.cpp
+++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp
@@ -73,14 +73,14 @@ TQString KVTNewStuff::downloadDestination(KNS::Entry * entry)
 
   if (KStandardDirs::exists(file))
   {
-    int result = KMessageBox::warningContinueCancel(parentWidget(),
+    int result = KMessageBox::warningContinueCancel(tqparentWidget(),
         i18n("The file '%1' already exists. Do you want to overwrite it?")
         .arg(file),
         TQString::null, i18n("Overwrite") );
     if (result == KMessageBox::Cancel)
       return TQString::null;
   }
-  KMessageBox::information(parentWidget(),
+  KMessageBox::information(tqparentWidget(),
     i18n("The selected file will now be downloaded and saved as\n'%1'.")
     .arg(file),
     TQString::null,
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
index b8218978..0746f18a 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
@@ -4,7 +4,7 @@
     
         AdjQueryDlgForm
     
-    
+    
         
             0
             0
@@ -122,7 +122,7 @@
             
                 Expanding
             
-            
+            
                 
                     390
                     60
@@ -131,7 +131,7 @@
         
         
             
-                layout7
+                tqlayout7
             
             
                 
@@ -158,7 +158,7 @@
                 
                 
                     
-                        layout6
+                        tqlayout6
                     
                     
                         
@@ -336,7 +336,7 @@
     know_it
     dont_know
 
-
+
 
     kprogress.h
     kprogress.h
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
index 7792ca92..64243f9e 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
@@ -4,7 +4,7 @@
     
         ArtQueryDlgForm
     
-    
+    
         
             0
             0
@@ -80,7 +80,7 @@
             
                 
             
-            
+            
             
             
                 
@@ -120,7 +120,7 @@
         
         
             
-                layout10
+                tqlayout10
             
             
                 
@@ -229,7 +229,7 @@
                 
                 
                     
-                        layout9
+                        tqlayout9
                     
                     
                         
@@ -339,7 +339,7 @@
     know_it
     dont_know
 
-
+
 
     kprogress.h
     kprogress.h
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
index 098bf7fa..7c930bcf 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
@@ -4,7 +4,7 @@
     
         MCQueryDlgForm
     
-    
+    
         
             0
             0
@@ -137,7 +137,7 @@
                     
                         -
                     
-                    
+                    
                         WordBreak|AlignVCenter
                     
                 
@@ -156,7 +156,7 @@
                     
                         -
                     
-                    
+                    
                         WordBreak|AlignVCenter
                     
                 
@@ -175,7 +175,7 @@
                     
                         -
                     
-                    
+                    
                         WordBreak|AlignVCenter
                     
                 
@@ -194,7 +194,7 @@
                     
                         -
                     
-                    
+                    
                         WordBreak|AlignVCenter
                     
                 
@@ -213,7 +213,7 @@
                     
                         -
                     
-                    
+                    
                         WordBreak|AlignVCenter
                     
                 
@@ -221,7 +221,7 @@
         
         
             
-                layout14
+                tqlayout14
             
             
                 
@@ -229,7 +229,7 @@
                 
                 
                     
-                        layout12
+                        tqlayout12
                     
                     
                         
@@ -436,7 +436,7 @@
     know_it
     dont_know
 
-
+
 
     kprogress.h
     kprogress.h
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
index d70b92ed..76346ef4 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
@@ -66,9 +66,9 @@ bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really)
   if (!field->isEnabled() )
     return true;
 
-  TQColorGroup u_normal = field->colorGroup();
+  TQColorGroup u_normal = field->tqcolorGroup();
   u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00));
-  TQColorGroup k_normal = field->colorGroup();
+  TQColorGroup k_normal = field->tqcolorGroup();
   k_normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x80, 0x00));
 
   TQPalette known_pal( field->palette());
@@ -85,7 +85,7 @@ bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really)
     ret = true;
     if ( known_pal.inactive() != k_normal
         || known_pal.active() != k_normal) {
-      // replace text colors
+      // tqreplace text colors
       known_pal.setActive(k_normal);
       known_pal.setInactive(k_normal);
       field->setPalette( known_pal );
@@ -94,7 +94,7 @@ bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really)
   else
     if ( unknown_pal.inactive() != u_normal
         || unknown_pal.active() != u_normal) {
-      // replace text colors
+      // tqreplace text colors
       unknown_pal.setActive(u_normal);
       unknown_pal.setInactive(u_normal);
       field->setPalette( unknown_pal );
@@ -107,11 +107,11 @@ void QueryDlgBase::resetField(TQLineEdit *field)
 {
   if (!field->isEnabled() )
     return;
-  TQColorGroup normal = field->colorGroup();
+  TQColorGroup normal = field->tqcolorGroup();
   normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00));
 
   TQPalette pal( field->palette());
-  // replace text colors
+  // tqreplace text colors
 
   if ( pal.inactive() != normal
       || pal.active() != normal) {
@@ -132,9 +132,9 @@ bool QueryDlgBase::verifyField(TQMultiLineEdit *field, const TQString &really, b
 {
   if (!field->isEnabled())
     return true;
-  TQColorGroup u_normal = field->colorGroup();
+  TQColorGroup u_normal = field->tqcolorGroup();
   u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00));
-  TQColorGroup k_normal = field->colorGroup();
+  TQColorGroup k_normal = field->tqcolorGroup();
   k_normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x80, 0x00));
 
   TQPalette known_pal( field->palette());
@@ -173,7 +173,7 @@ bool QueryDlgBase::verifyField(TQMultiLineEdit *field, const TQString &really, b
     ret = true;
     if (known_pal.inactive() != k_normal
         || known_pal.active() != k_normal) {
-      // replace text colors
+      // tqreplace text colors
       known_pal.setActive(k_normal);
       known_pal.setInactive(k_normal);
       field->setPalette( known_pal );
@@ -182,7 +182,7 @@ bool QueryDlgBase::verifyField(TQMultiLineEdit *field, const TQString &really, b
   else
     if ( unknown_pal.inactive() != u_normal
         || unknown_pal.active() != u_normal) {
-      // replace text colors
+      // tqreplace text colors
       unknown_pal.setActive(u_normal);
       unknown_pal.setInactive(u_normal);
       field->setPalette( unknown_pal );
@@ -195,11 +195,11 @@ void QueryDlgBase::resetField(TQMultiLineEdit *field)
 {
   if (!field->isEnabled() )
     return;
-  TQColorGroup normal = field->colorGroup();
+  TQColorGroup normal = field->tqcolorGroup();
   normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00));
 
   TQPalette pal( field->palette());
-  // replace text colors
+  // tqreplace text colors
 
   if ( pal.inactive() != normal
       || pal.active() != normal) {
@@ -221,15 +221,15 @@ void QueryDlgBase::verifyButton(TQRadioButton *radio, bool is_ok, TQWidget *widg
   if (!radio->isEnabled() )
     return;
 
-  TQColorGroup u_normal = radio->colorGroup();
+  TQColorGroup u_normal = radio->tqcolorGroup();
   u_normal.setColor(TQColorGroup::Foreground, TQColor(0xff, 0x00, 0x00));
-  TQColorGroup k_normal = radio->colorGroup();
+  TQColorGroup k_normal = radio->tqcolorGroup();
   k_normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x80, 0x00));
 
   TQPalette known_pal( radio->palette());
   TQPalette unknown_pal( radio->palette());
 
-  // replace text colors
+  // tqreplace text colors
 
   TQFont ft = radio->font();
   if (ft.weight() != TQFont::Bold) {
@@ -273,11 +273,11 @@ void QueryDlgBase::resetButton(TQRadioButton *radio, TQWidget *widget2)
 {
   if (!radio->isEnabled() )
     return;
-  TQColorGroup normal = radio->colorGroup();
+  TQColorGroup normal = radio->tqcolorGroup();
   normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x00, 0x00));
 
   TQPalette pal(radio->palette());
-  // replace text colors, avoid flickering
+  // tqreplace text colors, avoid flickering
   if ( pal.inactive() != normal
       || pal.active() != normal) {
     pal.setActive(normal);
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index 8f1e315f..520b908c 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -168,7 +168,7 @@ RandomQueryDlg::RandomQueryDlg(
     for ( i = 0; i < fields; i ++ )
     {
       transCombos.append (new TQComboBox (false, mw->TranslationFrame, TQCString ("transCombo") + TQCString().setNum (i)));
-      transCombos.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth()));
+      transCombos.at(i) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth()));
       transCombos.at(i) -> setEditable (true);
       transCombos.at(i) -> setInsertionPolicy (TQComboBox::NoInsertion);
       transCombos.at(i) -> setDuplicatesEnabled (false);
@@ -182,7 +182,7 @@ RandomQueryDlg::RandomQueryDlg(
     for ( i = 0; i < fields; i ++ )
     {
       transFields.append (new TQLineEdit (mw->TranslationFrame, TQCString ("transField") + TQCString().setNum (i)));
-      transFields.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth()));
+      transFields.at(i) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth()));
       vb->addWidget(transFields.at(i));
       connect (transFields.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&)));
       connect (transFields.at(i), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus()));
@@ -202,7 +202,7 @@ RandomQueryDlg::RandomQueryDlg(
     if ( split && kv_doc -> numEntries() >= 500 )
     {
       pdlg = new ProgressDlg (TQString(), TQString(), kapp -> makeStdCaption (i18n("Loading Random Query")));
-      pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().height());
+      pdlg -> resize (pdlg -> width(), pdlg -> tqminimumSize().height());
       pdlg -> show();
       kapp -> processEvents();
     }
@@ -651,7 +651,7 @@ void RandomQueryDlg::keyPressEvent( TQKeyEvent *e )
           {
             TQString trans (vocabulary[i]);
             if ( (e -> key() == Key_F5 && trans.startsWith (curText, false)
-                || e -> key() == Key_F6 && trans.contains (curText, false)) )
+                || e -> key() == Key_F6 && trans.tqcontains (curText, false)) )
               combo -> insertItem (trans);
           }
           combo -> setEditText (curText);
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
index fc573bf6..a52ec42e 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
@@ -4,7 +4,7 @@
     
         QueryDlgForm
     
-    
+    
         
             0
             0
@@ -190,7 +190,7 @@
             
                 Expanding
             
-            
+            
                 
                     450
                     40
@@ -199,7 +199,7 @@
         
         
             
-                layout4
+                tqlayout4
             
             
                 
@@ -229,7 +229,7 @@
                 
                 
                     
-                        layout3
+                        tqlayout3
                     
                     
                         
@@ -410,7 +410,7 @@
     know_it
     dont_know
 
-
+
 
     kprogress.h
     kprogress.h
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
index 1c6f8469..865a7f9e 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@@ -109,7 +109,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
        mw->instructionLabel->setText(i18n("Enter the synonym:"));
        setCaption (i18n("Synonym Training"));
        answerstring = exp->getSynonym(column);
-       mw->queryField->setAlignment(Qt::AlignVCenter);
+       mw->queryField->tqsetAlignment(Qt::AlignVCenter);
        mw->queryField->setText(column == 0 ? exp->getOriginal() : exp->getTranslation(column));
        setQueryFieldWordwrap();
      }
@@ -327,9 +327,9 @@ void SimpleQueryDlg::setQueryFieldWordwrap()
   int w = fm.width(mw->queryField->text());
   int w2 = mw->width();
   if (w > w2)
-    mw->queryField->setAlignment(Qt::AlignVCenter | Qt::WordBreak);
+    mw->queryField->tqsetAlignment(Qt::AlignVCenter | Qt::WordBreak);
   else
-    mw->queryField->setAlignment(Qt::AlignVCenter);
+    mw->queryField->tqsetAlignment(Qt::AlignVCenter);
 }
 
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
index 3ff31b5f..90822491 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
@@ -4,7 +4,7 @@
     
         SimpleQueryDlgForm
     
-    
+    
         
             0
             0
@@ -29,7 +29,7 @@
         
         
             
-                layout5
+                tqlayout5
             
             
                 
@@ -64,7 +64,7 @@
                     
                         
                     
-                    
+                    
                         WordBreak|AlignVCenter
                     
                 
@@ -106,7 +106,7 @@
             
                 Expanding
             
-            
+            
                 
                     300
                     16
@@ -115,7 +115,7 @@
         
         
             
-                layout17
+                tqlayout17
             
             
                 
@@ -240,7 +240,7 @@
                 
                 
                     
-                        layout16
+                        tqlayout16
                     
                     
                         
@@ -340,7 +340,7 @@
     know_it
     dont_know
 
-
+
 
     kprogress.h
     kprogress.h
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
index 0c7a5cb7..4d4ad6f5 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
@@ -4,7 +4,7 @@
     
         VerbQueryDlgForm
     
-    
+    
         
             0
             0
@@ -21,7 +21,7 @@
         
         
             
-                layout20
+                tqlayout20
             
             
                 
@@ -65,7 +65,7 @@
         
         
             
-                layout30
+                tqlayout30
             
             
                 
@@ -73,7 +73,7 @@
                 
                 
                     
-                        layout29
+                        tqlayout29
                     
                     
                         
@@ -163,7 +163,7 @@
                 
                 
                     
-                        layout27
+                        tqlayout27
                     
                     
                         
@@ -269,7 +269,7 @@
         
         
             
-                layout19
+                tqlayout19
             
             
                 
@@ -309,7 +309,7 @@
         
         
             
-                layout32
+                tqlayout32
             
             
                 
@@ -317,7 +317,7 @@
                 
                 
                     
-                        layout31
+                        tqlayout31
                     
                     
                         
@@ -516,7 +516,7 @@
             
                 Expanding
             
-            
+            
                 
                     390
                     16
@@ -541,7 +541,7 @@
     know_it
     dont_know
 
-
+
 
     kprogress.h
     kprogress.h
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
index 669ec746..cba2407b 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
+++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
@@ -4,7 +4,7 @@
     
         Form1
     
-    
+    
         
             0
             0
@@ -205,7 +205,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     20
@@ -214,5 +214,5 @@
         
     
 
-
+
 
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
index 7964f7e0..46a49a9e 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
@@ -4,7 +4,7 @@
     
         Form2
     
-    
+    
         
             0
             0
@@ -70,7 +70,7 @@
             
                 StatListView
             
-            
+            
                 
                     500
                     0
@@ -82,5 +82,5 @@
         
     
 
-
+
 
diff --git a/kvoctrain/kvoctrain/tools/extractlang.cpp b/kvoctrain/kvoctrain/tools/extractlang.cpp
index a775274e..c56308e9 100644
--- a/kvoctrain/kvoctrain/tools/extractlang.cpp
+++ b/kvoctrain/kvoctrain/tools/extractlang.cpp
@@ -31,7 +31,7 @@ void parseLanguage(TQString name, TQString three, TQString two)
     three_1.insert(slash, ", ");
   }
 
-  if (!two.contains(" ")) {
+  if (!two.tqcontains(" ")) {
       twoLangs.append("\t{{\"");
       twoLangs.append(two);
       twoLangs.append("\"}, {\"");
@@ -96,7 +96,7 @@ bool parseTR(TQString& line, TQTextIStream& in)
 
 
   uint count = 0;
-  while (line.contains(" 3)
 	return true;
@@ -111,7 +111,7 @@ bool parseTR(TQString& line, TQTextIStream& in)
       parseLanguage(text[0], text[2], text[3]);
     }
 
-  if (line.contains("/tr"))
+  if (line.tqcontains("/tr"))
     return true;
 
   return false;
@@ -130,7 +130,7 @@ int main()
       if (readNext)
 	line = in.readLine();
 
-      if (line.contains("