From 96698e12d1d6ba8072e9365334277438c3cf0e4a Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui | 2 +- kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui | 2 +- kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui | 2 +- kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui | 2 +- kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp | 8 ++++---- kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui | 2 +- kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui | 2 +- kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui | 2 +- kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui | 2 +- kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui | 2 +- kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui | 2 +- kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui | 2 +- kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui | 2 +- kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui | 2 +- kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui | 2 +- kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui | 2 +- kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui | 2 +- kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui | 2 +- kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui | 2 +- kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui | 2 +- kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui | 2 +- kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui | 2 +- kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui | 2 +- kvoctrain/kvoctrain/kva_io.cpp | 10 +++++----- kvoctrain/kvoctrain/kvt-core/langset.h | 2 +- kvoctrain/kvoctrain/kvtnewstuff.cpp | 4 ++-- kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui | 2 +- kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui | 4 ++-- kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui | 2 +- kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui | 2 +- kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui | 2 +- kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui | 2 +- kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui | 2 +- kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui | 2 +- 34 files changed, 43 insertions(+), 43 deletions(-) (limited to 'kvoctrain') diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui index 7de990b8..6fe8b52a 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui @@ -138,5 +138,5 @@ - + diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui index 78b92683..e64f19a2 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui @@ -268,5 +268,5 @@ block1 expire1 - + diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui index 4ef9eddd..d64fb69a 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui @@ -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 372d147e..937e8a75 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui @@ -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 36f61b00..27280504 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -814,12 +814,12 @@ void LanguageOptions::enableLangWidgets() { if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) { - TQStringList tqlayouts; + TQStringList layouts; TQDataStream stream(replyData, IO_ReadOnly); - stream >> tqlayouts; - tqlayouts.prepend(TQString()); + stream >> layouts; + layouts.prepend(TQString()); d_kbtqlayout->clear(); - d_kbtqlayout->insertStringList(tqlayouts); + d_kbtqlayout->insertStringList(layouts); } } } diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui index 7f9771f2..12b3b98e 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui @@ -344,7 +344,7 @@ b_lang_kde b_lang_iso1 - + kcombobox.h kcombobox.h diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui index da0c00a4..142ee7f5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui @@ -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 c2d0a0e0..3250b83e 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui @@ -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 85ad4a57..788ff271 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui @@ -294,5 +294,5 @@ - + diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui index 3365725d..9c6b18e6 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui @@ -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 3477bcd8..04bb8a38 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui @@ -54,5 +54,5 @@ - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui index ffdaa6e3..cd5b426b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui @@ -588,5 +588,5 @@ thirdM_plural thirdN_plural - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui index 91c77051..e189b5bc 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui @@ -139,5 +139,5 @@ b_delete b_cleanup - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui index aeb647f2..7ee368cc 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui @@ -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 7d6c157c..7a4aff84 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui @@ -182,5 +182,5 @@ e_license e_remark - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui index f48d5475..d5207579 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui @@ -139,5 +139,5 @@ b_delete b_cleanup - + diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui index 3fc06267..bca2b89d 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui @@ -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 ebc2f962..47ffa311 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui @@ -142,5 +142,5 @@ - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui index 3dea3260..b5cea508 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui @@ -225,5 +225,5 @@ remark_line para_line - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui index 44c2bf8c..428e902f 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui @@ -475,5 +475,5 @@ b_usageDlg c_active - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui index be339d37..d01d74bf 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui @@ -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 e7aa3073..07540e46 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui @@ -213,5 +213,5 @@ mc4Field mc5Field - + diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui index b03ecaa6..8c1e580b 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui @@ -383,5 +383,5 @@ thirdM_plural thirdN_plural - + diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index 22c75a4e..0bf3e6aa 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -182,7 +182,7 @@ void kvoctrainApp::slotFileOpen() if (queryExit() ) { TQString s; - KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, tqparentWidget(), i18n("Open Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, parentWidget(), i18n("Open Vocabulary File")); loadfileFromPath(url, true); } slotStatusMsg(IDS_DEFAULT); @@ -222,7 +222,7 @@ void kvoctrainApp::slotFileOpenExample() if (queryExit() ) { TQString s; s = locate("data", "kvoctrain/examples/"); - KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, tqparentWidget(), i18n("Open Example Vocabulary File")); + KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, parentWidget(), i18n("Open Example Vocabulary File")); loadfileFromPath(url, false); if (doc) doc->URL().setFileName(TQString()); @@ -244,7 +244,7 @@ void kvoctrainApp::slotFileMerge() slotStatusMsg(i18n("Merging file...")); TQString s; - KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, tqparentWidget(), i18n("Merge Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, parentWidget(), i18n("Merge Vocabulary File")); if (!url.isEmpty() ) { @@ -592,7 +592,7 @@ void kvoctrainApp::slotFileSaveAs() if (entryDlg != 0) commitEntryDlg(false); - KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As")); if (!url.isEmpty() ) { TQFileInfo fileinfo(url.path()); @@ -644,7 +644,7 @@ void kvoctrainApp::slotSaveSelection () if (doc->getEntry(i)->isInQuery() ) seldoc.appendEntry(doc->getEntry(i)); - KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As")); if (!url.isEmpty() ) { diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h index 335402a9..cfcc7f3b 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.h +++ b/kvoctrain/kvoctrain/kvt-core/langset.h @@ -64,7 +64,7 @@ class LangSet int indexShortId (TQString shortId) const; int indexLongId (TQString longId) const; int indexPixMapFile (TQString PixMapFile) const; - // doesn't make sense for keyboard tqlayouts since there is no 1-to-1 relation to languages + // doesn't make sense for keyboard layouts since there is no 1-to-1 relation to languages void setShortId (const TQString & shortId, int index); void setShortId2 (const TQString & shortId2, int index); diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp index c5f01f62..671d8899 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(tqparentWidget(), + int result = KMessageBox::warningContinueCancel(parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") .tqarg(file), TQString(), i18n("Overwrite") ); if (result == KMessageBox::Cancel) return TQString(); } - KMessageBox::information(tqparentWidget(), + KMessageBox::information(parentWidget(), i18n("The selected file will now be downloaded and saved as\n'%1'.") .tqarg(file), TQString(), diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui index 84ccb0fd..6aaf00a9 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui @@ -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 4c3aab52..42653ef9 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui @@ -80,7 +80,7 @@ - + @@ -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 cbe36379..edcb7c2e 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui @@ -436,7 +436,7 @@ know_it dont_know - + kprogress.h kprogress.h diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui index c88f5bbb..8b84c852 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui @@ -410,7 +410,7 @@ know_it dont_know - + kprogress.h kprogress.h diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui index 37505b61..c39377c7 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui @@ -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 8be670ab..0ca0d685 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui @@ -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 38b4d83d..db44fed9 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui @@ -214,5 +214,5 @@ - + diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui index 996f3a41..e1fcff46 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui @@ -82,5 +82,5 @@ - + -- cgit v1.2.1