diff options
Diffstat (limited to 'kvoctrain')
74 files changed, 406 insertions, 406 deletions
diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui index 33e090c9..2c5d44cb 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -12,7 +12,7 @@ <height>127</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>120</height> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>340</width> <height>22</height> @@ -138,5 +138,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui index 6909eae0..2bd5c449 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>BlockOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -241,7 +241,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>380</width> <height>30</height> @@ -268,5 +268,5 @@ <tabstop>block1</tabstop> <tabstop>expire1</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui index ce13b10c..3e8b5425 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>GeneralOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -122,7 +122,7 @@ <string>KVocTrain determines the resizing of the columns</string> </property> <property name="whatsThis" stdset="0"> - <string>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.</string> + <string>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.</string> </property> </widget> <widget class="QRadioButton"> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>123</height> @@ -182,7 +182,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui index cc4b4f27..ee90fe3a 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>GroupOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>16</height> @@ -143,5 +143,5 @@ <tabstop>ps_new</tabstop> <tabstop>ps_del</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index d92a9423..5da383b0 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_kbtqlayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); + connect(d_kblayout, 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_kbtqlayout->isEnabled()) + if (d_shortName->count() != 0 && d_kblayout->isEnabled()) { - for (int i = 0; i < d_kbtqlayout->count(); i++) + for (int i = 0; i < d_kblayout->count(); i++) { - if (d_kbtqlayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem())) + if (d_kblayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem())) { - d_kbtqlayout->setCurrentItem(i); + d_kblayout->setCurrentItem(i); break; } } @@ -782,9 +782,9 @@ void LanguageOptions::slotDeleteClicked() } -void LanguageOptions::slotKeyboardLayoutChanged(const TQString& tqlayout) +void LanguageOptions::slotKeyboardLayoutChanged(const TQString& layout) { - m_langSet.setKeyboardLayout(tqlayout, d_shortName->currentItem()); + m_langSet.setKeyboardLayout(layout, d_shortName->currentItem()); emit widgetModified(); m_hasChanged = true; } @@ -814,20 +814,20 @@ void LanguageOptions::enableLangWidgets() { if (replyType == "TQStringList") { - TQStringList tqlayouts; + TQStringList layouts; TQDataStream stream(replyData, IO_ReadOnly); - stream >> tqlayouts; - tqlayouts.prepend(TQString::null); - d_kbtqlayout->clear(); - d_kbtqlayout->insertStringList(tqlayouts); + stream >> layouts; + layouts.prepend(TQString::null); + d_kblayout->clear(); + d_kblayout->insertStringList(layouts); } } } else { //kdDebug() << "kxkb not enabled" << endl; - d_kbtqlayout->clear(); - d_kbtqlayout->setEnabled(false); + d_kblayout->clear(); + d_kblayout->setEnabled(false); } } @@ -898,22 +898,22 @@ void LanguageOptions::slotShortActivated(const TQString& _id) else b_langPixmap->setText (i18n("No Picture Selected")); - TQString tqlayout = m_langSet.keyboardLayout(d_shortName->currentItem()); + TQString layout = m_langSet.keyboardLayout(d_shortName->currentItem()); - //kdDebug() << "tqlayout to select " << tqlayout << endl; + //kdDebug() << "layout to select " << layout << endl; - for (int i = 0; i < d_kbtqlayout->count(); i++) + for (int i = 0; i < d_kblayout->count(); i++) { - if (d_kbtqlayout->text(i) == tqlayout) + if (d_kblayout->text(i) == layout) { - d_kbtqlayout->setCurrentItem(i); + d_kblayout->setCurrentItem(i); break; } } // not found - if (d_kbtqlayout->currentText() != tqlayout) + if (d_kblayout->currentText() != layout) { - d_kbtqlayout->setCurrentItem(0); + d_kblayout->setCurrentItem(0); } } } @@ -1015,8 +1015,8 @@ void LanguageOptions::loadCountryData() locale.setLanguage(curr_lang); KGlobal::_locale = &locale; - TQString sub = TQString::tqfromLatin1("l10n/"); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop")); + TQString sub = TQString::fromLatin1("l10n/"); + TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); regionlist.sort(); TQMap<TQString, Region> regions; @@ -1033,22 +1033,22 @@ void LanguageOptions::loadCountryData() if (index != -1) tag.truncate(index); KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); regions.insert(tag, Region(name)); } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop")); + TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); int idx = 0; for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit) { KSimpleConfig entry(*sit); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); - TQString submenu = entry.readEntry(TQString::tqfromLatin1("Region")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + TQString submenu = entry.readEntry(TQString::fromLatin1("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::tqfromLatin1("Languages"))); + TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::fromLatin1("Languages"))); TQValueList<int> 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 tqcontains the first letters + // only contains 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.tqcontains(i)) + if (countryIdMap.contains(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->tqcontains(s.stripWhiteSpace())) + if (d_shortName->contains(s.stripWhiteSpace())) { if (first) { @@ -1223,7 +1223,7 @@ void LanguageOptions::slotLangFromISO6391Activated(int id) { TQString shortid = global_langset.shortId(id); - if (d_shortName->tqcontains(shortid.stripWhiteSpace())) + if (d_shortName->contains(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 b240d850..84698be7 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>LanguageOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -93,7 +93,7 @@ </widget> <widget class="KComboBox" row="4" column="1"> <property name="name"> - <cstring>d_kbtqlayout</cstring> + <cstring>d_kblayout</cstring> </property> <property name="toolTip" stdset="0"> <string>Select a language or use the Add New Language Code to add one.</string> @@ -205,7 +205,7 @@ </widget> <widget class="QLabel" row="4" column="0"> <property name="name"> - <cstring>label_kbtqlayout</cstring> + <cstring>label_kblayout</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -216,10 +216,10 @@ </sizepolicy> </property> <property name="text"> - <string>Keyboard tqlayout:</string> + <string>Keyboard layout:</string> </property> <property name="buddy" stdset="0"> - <cstring>d_kbtqlayout</cstring> + <cstring>d_kblayout</cstring> </property> <property name="toolTip" stdset="0"> <string>You can assign a language to each column</string> @@ -258,7 +258,7 @@ <string>Obtains the language choices from the KDE database</string> </property> <property name="whatsThis" stdset="0"> - <string>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.</string> + <string>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.</string> </property> </widget> <widget class="QPushButton" row="2" column="0" rowspan="1" colspan="2"> @@ -275,7 +275,7 @@ <string>List of languages covered by ISO639-1</string> </property> <property name="whatsThis" stdset="0"> - <string>Pressing this button opens a menu that tqcontains all the language codes that are covered by "ISO639-1"</string> + <string>Pressing this button opens a menu that contains all the language codes that are covered by "ISO639-1"</string> </property> </widget> <widget class="QPushButton" row="0" column="1"> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>390</width> <height>20</height> @@ -337,14 +337,14 @@ <tabstop>e_shortName2</tabstop> <tabstop>e_langLong</tabstop> <tabstop>b_langPixmap</tabstop> - <tabstop>d_kbtqlayout</tabstop> + <tabstop>d_kblayout</tabstop> <tabstop>b_langDel</tabstop> <tabstop>e_newName</tabstop> <tabstop>b_langNew</tabstop> <tabstop>b_lang_kde</tabstop> <tabstop>b_lang_iso1</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp index 32efc138..ca79f2d5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp @@ -248,7 +248,7 @@ void PasteOptions::slotSyncPasteOrderList() } } - // order_list tqcontains elements unknown in language set? remove them + // order_list contains 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 tqcontains new elements? append them + // language set contains 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 be30bac8..3ee107fc 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PasteOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -37,7 +37,7 @@ <property name="name"> <cstring>SeparatorCombo</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>310</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -164,7 +164,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>31</height> @@ -207,7 +207,7 @@ <tabstop>SkipButton</tabstop> <tabstop>DownButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui index 3f3d14ed..24e70c58 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QueryOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -242,7 +242,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>48</height> @@ -261,7 +261,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -290,7 +290,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> @@ -309,7 +309,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -390,7 +390,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -439,7 +439,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>83</width> <height>20</height> @@ -475,7 +475,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>16</height> @@ -563,7 +563,7 @@ <tabstop>kcfg_ShowMore</tabstop> <tabstop>kcfg_IKnow</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui index 05df9d74..4cf771c2 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ThresholdOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -145,7 +145,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -209,7 +209,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -285,7 +285,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>16</height> @@ -294,5 +294,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui index 2dec0a3e..3bb2af24 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ViewOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -448,7 +448,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -520,7 +520,7 @@ <includes> <include location="global" impldecl="in declaration">kcolorbutton.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontrequester.h</includehint> <includehint>kfontrequester.h</includehint> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui index 63afd416..137d3df5 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Document_options</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -54,5 +54,5 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui index 27fe6d39..cce69a3f 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>LangPropPage</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -70,7 +70,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -93,7 +93,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -225,7 +225,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -464,7 +464,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -588,5 +588,5 @@ <tabstop>thirdM_plural</tabstop> <tabstop>thirdN_plural</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp index c7c14584..d7015435 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<int> translate_index; ///////////////////////////////////////////////////// - // translate_index tqcontains new index number for each + // translate_index contains 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 0025b54c..b5a54e06 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<int> lessonIndex; // tqcontains indices of lesson on exec() + vector<int> lessonIndex; // contains 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 d0d8ba08..311ab3bc 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Lesson_Descriptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp index aae596bb..00325b7b 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<int> &tenseIndex, vector<TQString> new_tenseStr; ///////////////////////////////////////////////////// - // translate_index tqcontains new index number for each + // translate_index contains 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 53c08bc7..1cc3913b 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<int> tenseIndex; // tqcontains indices of tenses on exec() + vector<int> tenseIndex; // contains 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 3db0be2d..b0471df8 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Tense_Descriptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui index a355da67..b2a49e51 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TitlePage</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -182,5 +182,5 @@ <tabstop>e_license</tabstop> <tabstop>e_remark</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp index b500bf2a..c89129b8 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<int> &typeIndex, i vector<TQString> new_typeStr; ///////////////////////////////////////////////////// - // translate_index tqcontains new index number for each + // translate_index contains 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 f59fc37b..68e50b26 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<int> typeIndex; // tqcontains indices of types on exec() + vector<int> typeIndex; // contains 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 1b27973a..f1735015 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Type_Descriptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp index c28e6d55..96c4a093 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<TQString> new_usageStr; ///////////////////////////////////////////////////// - // translate_index tqcontains new index number for each + // translate_index contains 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 d8db70ff..8d669571 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<int> usageIndex; // tqcontains indices of usages on exec() + vector<int> usageIndex; // contains 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 73571c94..dbdf58fe 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Usage_Labels</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui index e599d674..a2213edb 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AdjEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -142,5 +142,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui index 6e550b11..632973bc 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AuxInfoEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -70,7 +70,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -89,7 +89,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -108,7 +108,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -182,7 +182,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -207,7 +207,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -225,5 +225,5 @@ <tabstop>remark_line</tabstop> <tabstop>para_line</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp index daaed082..9a7d44fb 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::tqcontains(TQString(usages[i].identStr()), act_usage)) { + if (UsageManager::contains(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 cf8394ad..5e67f8a4 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>CommonEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -165,13 +165,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>30</height> @@ -196,13 +196,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>30</height> @@ -257,7 +257,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -300,13 +300,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>30</height> @@ -358,13 +358,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>24</height> @@ -387,7 +387,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -406,7 +406,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>90</height> @@ -428,7 +428,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>80</height> @@ -440,7 +440,7 @@ <property name="frameShadow"> <enum>Sunken</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -475,5 +475,5 @@ <tabstop>b_usageDlg</tabstop> <tabstop>c_active</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h index d9d22c67..9850e107 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->tqCountDirty() : false; } + bool fromQCountDirty () const { return from_page ? from_page->qCountDirty() : 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->tqCountDirty() : false; } + bool toQCountDirty () const { return to_page ? to_page->qCountDirty() : 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 8162ee3b..238f4462 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 tqCountDirty () const { return qcount_dirty; } + count_t qCountDirty () 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 d4a1faa7..9fea8f70 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FromToEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -150,7 +150,7 @@ <property name="name"> <cstring>year_spin</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -161,7 +161,7 @@ <property name="name"> <cstring>month_spin</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -172,7 +172,7 @@ <property name="name"> <cstring>day_spin</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -316,5 +316,5 @@ <tabstop>qcount_line</tabstop> <tabstop>bcount_line</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui index 488f5234..b03b2de6 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MCEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -213,5 +213,5 @@ <tabstop>mc4Field</tabstop> <tabstop>mc5Field</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index 11865aee..47487624 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 *tqunicodename; + const char *unicodename; const char *audible; }; -KV_Unicode_Ref kv_tqunicode_ref[] = { +KV_Unicode_Ref kv_unicode_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_tqunicode_ref[] = { void PhoneticButton::slotClicked() { if (text().length() != 0) - emit page->charSelected(text()[0].tqunicode()); + emit page->charSelected(text()[0].unicode()); } 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_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]); + int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_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_tqunicode_ref; + KV_Unicode_Ref *uni_ref = kv_unicode_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::tqfromLatin1(uni_ref->tqunicodename); + tip += TQString::fromLatin1(uni_ref->unicodename); tip += "\n"; tip += i18n("Describing the sound of the character", "Sound: "); tip += i18n(uni_ref->audible); butt->setFont(ipafont); - butt->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + butt->setSizePolicy(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(tqsizeHint()); + resize(sizeHint()); } @@ -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].tqunicode()); + emit charSelected(s[i].unicode()); } e->accept(); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui index 882884f1..1c3c4ee5 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TenseEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -44,7 +44,7 @@ </property> <widget class="QLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -307,7 +307,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -383,5 +383,5 @@ <tabstop>thirdM_plural</tabstop> <tabstop>thirdN_plural</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/kv_resource.h b/kvoctrain/kvoctrain/kv_resource.h index 76ddc776..6f704913 100644 --- a/kvoctrain/kvoctrain/kv_resource.h +++ b/kvoctrain/kvoctrain/kv_resource.h @@ -35,7 +35,7 @@ #include <klocale.h> /////////////////////////////////////////////////////////////////// -// kv_resource.h -- tqcontains macros used for commands +// kv_resource.h -- contains 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 9a1d5c72..d441cc2e 100644 --- a/kvoctrain/kvoctrain/kva_clip.cpp +++ b/kvoctrain/kvoctrain/kva_clip.cpp @@ -112,7 +112,7 @@ vector<int> kvoctrainApp::getCsvOrder(kvoctrainDoc *doc) void kvoctrainApp::slotEditCopy() { - slotqStatusMsg(i18n("Copying selection to clipboard...")); + slotStatusMsg(i18n("Copying selection to clipboard...")); TQApplication::setOverrideCursor( waitCursor ); TQString exp; @@ -157,13 +157,13 @@ void kvoctrainApp::slotEditCopy() } TQApplication::restoreOverrideCursor(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotEditPaste() { - slotqStatusMsg(i18n("Inserting clipboard contents...")); + slotStatusMsg(i18n("Inserting clipboard contents...")); TQApplication::setOverrideCursor( waitCursor ); TQString s; @@ -228,7 +228,7 @@ void kvoctrainApp::slotEditPaste() } TQApplication::restoreOverrideCursor(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp index 4ce0f6c5..d1572659 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(slotHeadertqStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(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(slotHeadertqStatus(int))); + connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(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(slotHeadertqStatus(int))); + connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(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(slotHeadertqStatus(int))); + connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(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(slotHeadertqStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); header_m->exec(TQPoint(x, y)); } @@ -222,11 +222,11 @@ void kvoctrainApp::slotSetHeaderProp (int header_and_id) /*FOLD00*/ } */ doc->setModified(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } -void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ +void kvoctrainApp::slotHeaderStatus (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::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ break; case ID_RESUME_QUERY: - slotqStatusHelpMsg(i18n("Resumes random query with existing selection")); + slotStatusHelpMsg(i18n("Resumes random query with existing selection")); break; case ID_RESUME_MULTIPLE: - slotqStatusHelpMsg(i18n("Resumes multiple choice with existing selection")); + slotStatusHelpMsg(i18n("Resumes multiple choice with existing selection")); break; case IDH_SORT_COL_ALPHA: - slotqStatusHelpMsg(i18n("Sorts column alphabetically up/down")); + slotStatusHelpMsg(i18n("Sorts column alphabetically up/down")); break; case IDH_SORT_COL_NUM: - slotqStatusHelpMsg(i18n("Sorts column by lesson index up/down")); + slotStatusHelpMsg(i18n("Sorts column by lesson index up/down")); break; case IDH_SET_LANG: { @@ -268,7 +268,7 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ TQString format = i18n("Sets %1 as language for translation %2"); msg = format.arg(from).arg(header1); } - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } break; @@ -277,13 +277,13 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ TQString msg; if (header1 == 0xFF) { msg = i18n("Appends a new language"); - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } else if (header1 < (int) langset.size() ) { TQString from = langset.longId(header1); TQString format = i18n("Appends %1 as new language"); msg = format.arg(from); - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } } break; @@ -295,7 +295,7 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ TQString msg; TQString format = i18n("Removes %1 irrevocably from dictionary"); msg = format.arg(from); - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } break; @@ -327,47 +327,47 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ msg = format.arg(from).arg(to); } - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } break; case IDH_START_VERB: { - slotqStatusHelpMsg(i18n("Starts training with verbs")); + slotStatusHelpMsg(i18n("Starts training with verbs")); } break; case IDH_START_ARTICLE: { - slotqStatusHelpMsg(i18n("Starts training with articles")); + slotStatusHelpMsg(i18n("Starts training with articles")); } break; case IDH_START_ADJECTIVE: { - slotqStatusHelpMsg(i18n("Starts training with adjectives")); + slotStatusHelpMsg(i18n("Starts training with adjectives")); } break; case IDH_START_SYNONYM: { - slotqStatusHelpMsg(i18n("Starts training with synonyms")); + slotStatusHelpMsg(i18n("Starts training with synonyms")); } break; case IDH_START_ANTONYM: { - slotqStatusHelpMsg(i18n("Starts training with antonyms")); + slotStatusHelpMsg(i18n("Starts training with antonyms")); } break; case IDH_START_EXAMPLE: { - slotqStatusHelpMsg(i18n("Starts training with examples")); + slotStatusHelpMsg(i18n("Starts training with examples")); } break; case IDH_START_PARAPHRASE: { - slotqStatusHelpMsg(i18n("Starts training with paraphrases")); + slotStatusHelpMsg(i18n("Starts training with paraphrases")); } break; case IDH_CREATE_LESSON: { - slotqStatusHelpMsg(i18n("Creates lesson")); + slotStatusHelpMsg(i18n("Creates lesson")); } break; @@ -377,12 +377,12 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ from = langset.findLongId(from); TQString format = i18n("Resets all properties for %1"); TQString msg = format.arg(from); - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } break; default: - kdError() << "kvoctrainApp::slotHeadertqStatus: got unknown command :" << cmd << endl; + kdError() << "kvoctrainApp::slotHeaderStatus: got unknown command :" << cmd << endl; } } @@ -564,7 +564,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ kdError() << "kvoctrainApp::slotHeaderCallBack: got unknown command\n"; } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index c1f1cb49..c1b3ebe8 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(slotHeadertqStatus(int))); + connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(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(slotHeadertqStatus(int))); + connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(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(actiontqStatusText(const TQString &)), this, TQT_SLOT(slotqStatusHelpMsg(const TQString &))); + connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusHelpMsg(const TQString &))); //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool))); if (!initialGeometrySet()) - resize( TQSize(550, 400).expandedTo(tqminimumSizeHint())); + resize( TQSize(550, 400).expandedTo(minimumSizeHint())); 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(slotHeadertqStatus(int))); + connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(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); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index 9b282c9e..c809cc3a 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() ) { - slotqStatusMsg(i18n("Autobackup in progress")); + slotStatusMsg(i18n("Autobackup in progress")); slotFileSave(); } if (Prefs::backupTime() > 0) btimer->start(Prefs::backupTime() * 60 * 1000, TRUE); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -126,7 +126,7 @@ void kvoctrainApp::slotFileQuit() kapp->quit(); } else - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -142,19 +142,19 @@ void kvoctrainApp::slotProgress(kvoctrainDoc *curr_doc, int percent) void kvoctrainApp::slotFileOpenRecent(const KURL& url) { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); if (queryExit() && fileOpenRecent->items().count() > 0) { fileOpenRecent->setCurrentItem(-1); loadfileFromPath(url); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotFileNew() { - slotqStatusMsg(i18n("Creating new file...")); + slotStatusMsg(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); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotFileOpen() { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); if (queryExit() ) { TQString s; - KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, tqparentWidget(), i18n("Open Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Open Vocabulary File")); loadfileFromPath(url, true); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(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()); - slotqStatusMsg(msg); + slotStatusMsg(msg); prepareProgressBar(); doc = new kvoctrainDoc (this, url); removeProgressBar(); @@ -217,17 +217,17 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) void kvoctrainApp::slotFileOpenExample() { - slotqStatusMsg(i18n("Opening example file...")); + slotStatusMsg(i18n("Opening example file...")); 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::null); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -241,17 +241,17 @@ void kvoctrainApp::slotGHNS() void kvoctrainApp::slotFileMerge() { - slotqStatusMsg(i18n("Merging file...")); + slotStatusMsg(i18n("Merging file...")); TQString s; - KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, tqparentWidget(), i18n("Merge Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Merge Vocabulary File")); if (!url.isEmpty() ) { TQString format = i18n("Loading %1"); TQString msg = format.arg(url.path()); - slotqStatusMsg(msg); + slotStatusMsg(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()); - slotqStatusMsg(msg); + slotStatusMsg(msg); TQApplication::setOverrideCursor( waitCursor ); @@ -485,7 +485,7 @@ void kvoctrainApp::slotFileMerge() view->getTable()->setFont(Prefs::tableFont()); view->adjustContent(); TQApplication::restoreOverrideCursor(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -501,7 +501,7 @@ void kvoctrainApp::slotFileSave() TQString format = i18n("Saving %1"); TQString msg = format.arg(doc->URL().path()); - slotqStatusMsg(msg); + slotStatusMsg(msg); // remove previous backup TQFile::remove(TQFile::encodeName(doc->URL().path()+"~")); @@ -514,7 +514,7 @@ void kvoctrainApp::slotFileSave() fileOpenRecent->addURL(doc->URL()); removeProgressBar(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -587,12 +587,12 @@ void kvoctrainApp::saveDocProps(kvoctrainDoc *the_doc) void kvoctrainApp::slotFileSaveAs() { - slotqStatusMsg(i18n("Saving file under new filename...")); + slotStatusMsg(i18n("Saving file under new filename...")); if (entryDlg != 0) commitEntryDlg(false); - KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), 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()); - slotqStatusMsg(msg); + slotStatusMsg(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(); } } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -628,7 +628,7 @@ void kvoctrainApp::slotSaveSelection () if (entryDlg != 0) commitEntryDlg(false); - slotqStatusMsg(i18n("Saving selected area under new filename...")); + slotStatusMsg(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, tqparentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), 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()); - slotqStatusMsg(msg); + slotStatusMsg(msg); TQFile::remove(url.path()+"~"); // remove previous backup // FIXME: check error @@ -672,7 +672,7 @@ void kvoctrainApp::slotSaveSelection () } } Prefs::setSeparator(save_separator); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp index 3a90f66e..0f2ca08d 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() ); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } } @@ -123,7 +123,7 @@ void kvoctrainApp::slotQueryOptions(int pageindex) void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property) { removeEntryDlg(); - slotqStatusMsg(i18n("Starting property query...")); + slotStatusMsg(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(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -288,14 +288,14 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res) doc); simpleQueryDlg->initFocus(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) { removeEntryDlg(); - slotqStatusMsg(i18n("Starting special query...")); + slotStatusMsg(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; } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -544,7 +544,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res) slotStopQuery(true); return; } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -561,7 +561,7 @@ void kvoctrainApp::slotRestartQuery() void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & orglang, bool create_new) { removeEntryDlg(); - slotqStatusMsg(i18n("Starting random query...")); + slotStatusMsg(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; } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -993,7 +993,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res) doc); mcQueryDlg->initFocus(); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index 989b967e..62d2e901 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 tqcontains unsaved changes.\n" + i18n("The entry dialog contains 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() ); - slotqStatusMsg(i18n("Updating lesson indices...")); + slotStatusMsg(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)); - slotqStatusMsg(i18n("Updating type indices...")); + slotStatusMsg(i18n("Updating type indices...")); TypeOptPage::cleanUnused(doc, typeIndex, old_types); QueryManager::setTypeNames (new_typeStr); - slotqStatusMsg(i18n("Updating tense indices...")); + slotStatusMsg(i18n("Updating tense indices...")); TenseOptPage::cleanUnused(doc, tenseIndex, old_tenses); Conjugation::setTenseNames (new_tenseStr); - slotqStatusMsg(i18n("usage (area) of an expression", + slotStatusMsg(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(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } } @@ -674,7 +674,7 @@ void kvoctrainApp::slotDocPropsLang () view->getTable()->updateContents(); setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } } @@ -682,7 +682,7 @@ void kvoctrainApp::slotDocPropsLang () void kvoctrainApp::slotModifiedDoc(bool mod) { setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -831,7 +831,7 @@ void kvoctrainApp::keyPressEvent( TQKeyEvent *e ) if (!found) e->ignore(); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -885,7 +885,7 @@ void kvoctrainApp::slotCleanVocabulary () TQApplication::restoreOverrideCursor(); removeProgressBar(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); if (num != 0) { view->setView(doc, langset); @@ -910,7 +910,7 @@ void kvoctrainApp::slotCreateRandom() Prefs::setEntriesPerLesson(res); - slotqStatusMsg(i18n("Creating random lessons...")); + slotStatusMsg(i18n("Creating random lessons...")); TQApplication::setOverrideCursor( waitCursor ); vector<kvoctrainExpr*> randomList; @@ -948,7 +948,7 @@ void kvoctrainApp::slotCreateRandom() doc->setModified (); } TQApplication::restoreOverrideCursor(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -1047,7 +1047,7 @@ void kvoctrainApp::slotResumeSearch(const TQString& s) return; } - slotqStatusMsg(i18n("Searching expression...")); + slotStatusMsg(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(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } -void kvoctrainApp::slotqStatusMsg(const TQString &/*text*/) +void kvoctrainApp::slotStatusMsg(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(slotHeadertqStatus(int))); + connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(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(slotHeadertqStatus(int))); + connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); } connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(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(slotHeadertqStatus(int))); + connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); if (header == 0) set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL); @@ -1311,7 +1311,7 @@ void kvoctrainApp::aboutToShowVocabRemoveLanguage() } -void kvoctrainApp::slotqStatusHelpMsg(const TQString &text) +void kvoctrainApp::slotStatusHelpMsg(const TQString &text) { /////////////////////////////////////////////////////////////////// // change status message of whole statusbar temporary (text, msec) @@ -1321,7 +1321,7 @@ void kvoctrainApp::slotqStatusHelpMsg(const TQString &text) void kvoctrainApp::slotFilePrint() { - slotqStatusMsg(i18n("Printing...")); + slotStatusMsg(i18n("Printing...")); KPrinter printer; printer.setFullPage(true); if (printer.setup(this)) @@ -1329,7 +1329,7 @@ void kvoctrainApp::slotFilePrint() view->print(&printer); } - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } #include "kvoctrain.moc" diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h index b19b0d0a..a1be3c54 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 slotHeadertqStatus (int cmd_and_id); + void slotHeaderStatus (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 slotqStatusMsg(const TQString &text); + void slotStatusMsg(const TQString &text); /** change the status message of the whole statusbar temporary */ - void slotqStatusHelpMsg(const TQString &text); + void slotStatusHelpMsg(const TQString &text); public: void removeProgressBar(); diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index bb40512a..7dc54b45 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 tqreplace) +TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace) { if (KApplication::dcopClient()->isApplicationRegistered("kxkb")) { @@ -103,12 +103,12 @@ TQWidget* KVocTrainTable::beginEdit(int row, int col, bool tqreplace) } } } - return TQTable::beginEdit(row, col, tqreplace); + return TQTable::beginEdit(row, col, replace); } -void KVocTrainTable::endEdit(int row, int col, bool accept, bool tqreplace) +void KVocTrainTable::endEdit(int row, int col, bool accept, bool replace) { - TQTable::endEdit(row, col, accept, tqreplace); + TQTable::endEdit(row, col, accept, replace); } */ 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); - tqrepaintContents(); + repaintContents(); 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().tqstyleHint( TQStyle::SH_Table_GridLineColor, this ); + int gridColor = style().styleHint( TQStyle::SH_Table_GridLineColor, this ); if (gridColor != -1) { const TQPalette &pal = palette(); - if (cg != tqcolorGroup() + if (cg != colorGroup() && cg != pal.disabled() && cg != pal.inactive()) p->setPen(cg.mid()); diff --git a/kvoctrain/kvoctrain/kvoctraintable.h b/kvoctrain/kvoctrain/kvoctraintable.h index 9d2cc779..77fffa77 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 tqreplace); - //void endEdit(int row, int col, bool accept, bool tqreplace); + //TQWidget* beginEdit(int row, int col, bool replace); + //void endEdit(int row, int col, bool accept, bool replace); 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 89bcdf52..f4aefca8 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 tqreplaced + // we do not want that this item can be replaced 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->tqsizeHint(); + TQSize sz = statebox->sizeHint(); 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 e7d9ad56..ebad99ee 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_tqlayout = new TQGridLayout( this, 2, 1/*, 4 */); - list_tqlayout->addWidget(m_table, 1, 0); - list_tqlayout->setRowStretch(1, 1); - list_tqlayout->activate(); + list_layout = new TQGridLayout( this, 2, 1/*, 4 */); + list_layout->addWidget(m_table, 1, 0); + list_layout->setRowStretch(1, 1); + list_layout->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 tqmask(arrow.width(), arrow.height()); + TQBitmap mask(arrow.width(), arrow.height()); arrow.fill(Qt::white); - tqmask.fill(Qt::black); + mask.fill(Qt::black); bitBlt(&arrow, 0, 0, &pix, 0, 0); - if (pix.tqmask() != 0) - bitBlt(&tqmask, 0, 0, pix.tqmask(), 0, 0); + if (pix.mask() != 0) + bitBlt(&mask, 0, 0, pix.mask(), 0, 0); else { TQBitmap bmp(pix.createHeuristicMask()); - bitBlt(&tqmask, 0, 0, &bmp, 0, 0); + bitBlt(&mask, 0, 0, &bmp, 0, 0); } TQPainter p, pm; p.begin(&arrow); - pm.begin(&tqmask); + pm.begin(&mask); 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(tqmask); + arrow.setMask(mask); TQIconSet set(arrow, TQIconSet::Small); header->setLabel(id, set, name); diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h index c5d46f10..f76e240e 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_tqlayout; + TQGridLayout * list_layout; 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 f1161025..9180d6e4 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp @@ -135,7 +135,7 @@ vector<UsageRelation> UsageManager::getRelation () } -bool UsageManager::tqcontains (const TQString& label, const TQString& collection) +bool UsageManager::contains (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 dcbb2ae5..647de685 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h @@ -114,7 +114,7 @@ class UsageManager UsageManager (); - static bool tqcontains (const TQString& label, const TQString& collection); + static bool contains (const TQString& label, const TQString& collection); static vector<UsageRelation> getRelation (); static void setUsageNames (vector<TQString> names); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp index 8d72ee87..e4906935 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].tqunicode(); + ushort trigger = s[i].unicode(); if (trigger >= 0x80) { int remain = s.length() - i; if ((trigger & 0xE0) == 0xC0){ // 110x xxxx if ( (remain > 1) - && (s[i+1].tqunicode() & 0xC0) == 0x80) + && (s[i+1].unicode() & 0xC0) == 0x80) utf8_mode = true; } else if ((trigger & 0xF0) == 0xE0) { // 1110 xxxx if ( remain > 2 - && s[i+1].tqunicode() & 0xC0 == 0x80 - && s[i+2].tqunicode() & 0xC0 == 0x80) + && s[i+1].unicode() & 0xC0 == 0x80 + && s[i+2].unicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xF8) == 0xF0) { // 1111 0xxx if ( remain > 3 - && s[i+1].tqunicode() & 0xC0 == 0x80 - && s[i+2].tqunicode() & 0xC0 == 0x80 - && s[i+3].tqunicode() & 0xC0 == 0x80) + && s[i+1].unicode() & 0xC0 == 0x80 + && s[i+2].unicode() & 0xC0 == 0x80 + && s[i+3].unicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFC) == 0xF8) { // 1111 10xx if ( remain > 4 - && 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+1].unicode() & 0xC0 == 0x80 + && s[i+2].unicode() & 0xC0 == 0x80 + && s[i+3].unicode() & 0xC0 == 0x80 + && s[i+4].unicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFE) == 0xFC) { // 1111 110x if ( remain > 5 - && 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) + && 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) utf8_mode = true; } } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp index 3d635cfe..f07e906d 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 tqcontains an unknown attribute <%1> " // keep trailing space + "Your document contains 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 tqcontains an unknown tag <%1>. " // keep trailing space + "Your document contains 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 5b8e229f..7cce072b 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.tqcontains("\","); + c+= temp.contains("\","); 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 c0c48055..365882c6 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 "ShowtqStatusbar" +#define CFG_SHOW_STATUSBAR "ShowStatusbar" #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 8a03fa96..a10aa28a 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 ); - TQ_INT8 c1, c2, c3, c4, c5; + Q_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.tqcontains('"') == 1 || line.tqcontains(TQRegExp("\",[0-9]")))) + if (c1 == '"' && (line.contains('"') == 1 || line.contains(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 c44abf72..c331aac0 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 tqcontains common for all three +#define KV_CONJ_COMMON "common" // female contains common for all three #define LEX_IDENT_50 "Vocabulary Trainer V5.0" @@ -247,7 +247,7 @@ class TQStringList; class MultipleChoice; /************************************************************* - * This class tqcontains the expressions of your vocabulary + * This class contains 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 490a498b..f31cd1e9 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 tqcontains one expression as original or in one + * This class contains 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 c9664f2c..2c95a515 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 tqcontains methods for output XML elements with attributes. + * It contains methods for output XML elements with attributes. * * Sample code: * <pre> @@ -32,8 +32,8 @@ class KOXML_OSTREAM; * * xml.startTag ("head"); // writes <head> * - * // write <tqlayout format="a4" orientation="landscape"> - * xml.startTag ("tqlayout", false); + * // write <layout format="a4" orientation="landscape"> + * xml.startTag ("layout", 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 19f6108a..633e6f59 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& tqlayout, int index) +void LangSet::setKeyboardLayout(const TQString& layout, int index) { if (index < (int) langs.size()) { - langs[index].keyboardLayout = tqlayout; + langs[index].keyboardLayout = layout; } } diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h index 39886b15..526f330d 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 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); void setLongId (const TQString & longId, int index); void setPixMapFile (const TQString & PixMapFile, int index); - void setKeyboardLayout(const TQString & tqlayout, int index); + void setKeyboardLayout(const TQString & layout, 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 c9e86e02..2714cf76 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?") .arg(file), TQString::null, i18n("Overwrite") ); if (result == KMessageBox::Cancel) return TQString::null; } - KMessageBox::information(tqparentWidget(), + KMessageBox::information(parentWidget(), i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>") .arg(file), TQString::null, diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui index 0746f18a..b8218978 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AdjQueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>390</width> <height>60</height> @@ -131,7 +131,7 @@ </spacer> <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -158,7 +158,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -336,7 +336,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui index 64243f9e..7792ca92 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArtQueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -80,7 +80,7 @@ <property name="title"> <string></string> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -120,7 +120,7 @@ </widget> <widget class="QLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -229,7 +229,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -339,7 +339,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui index 7c930bcf..098bf7fa 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MCQueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -137,7 +137,7 @@ <property name="text"> <string>-</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -156,7 +156,7 @@ <property name="text"> <string>-</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -175,7 +175,7 @@ <property name="text"> <string>-</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -194,7 +194,7 @@ <property name="text"> <string>-</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -213,7 +213,7 @@ <property name="text"> <string>-</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -221,7 +221,7 @@ </widget> <widget class="QLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -229,7 +229,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> @@ -436,7 +436,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp index 76346ef4..d70b92ed 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->tqcolorGroup(); + TQColorGroup u_normal = field->colorGroup(); u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00)); - TQColorGroup k_normal = field->tqcolorGroup(); + TQColorGroup k_normal = field->colorGroup(); 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) { - // tqreplace text colors + // replace 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) { - // tqreplace text colors + // replace 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->tqcolorGroup(); + TQColorGroup normal = field->colorGroup(); normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00)); TQPalette pal( field->palette()); - // tqreplace text colors + // replace 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->tqcolorGroup(); + TQColorGroup u_normal = field->colorGroup(); u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00)); - TQColorGroup k_normal = field->tqcolorGroup(); + TQColorGroup k_normal = field->colorGroup(); 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) { - // tqreplace text colors + // replace 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) { - // tqreplace text colors + // replace 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->tqcolorGroup(); + TQColorGroup normal = field->colorGroup(); normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00)); TQPalette pal( field->palette()); - // tqreplace text colors + // replace 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->tqcolorGroup(); + TQColorGroup u_normal = radio->colorGroup(); u_normal.setColor(TQColorGroup::Foreground, TQColor(0xff, 0x00, 0x00)); - TQColorGroup k_normal = radio->tqcolorGroup(); + TQColorGroup k_normal = radio->colorGroup(); k_normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x80, 0x00)); TQPalette known_pal( radio->palette()); TQPalette unknown_pal( radio->palette()); - // tqreplace text colors + // replace 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->tqcolorGroup(); + TQColorGroup normal = radio->colorGroup(); normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x00, 0x00)); TQPalette pal(radio->palette()); - // tqreplace text colors, avoid flickering + // replace 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 520b908c..8f1e315f 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) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth())); + transCombos.at(i) -> setSizePolicy (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) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth())); + transFields.at(i) -> setSizePolicy (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 -> tqminimumSize().height()); + pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().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.tqcontains (curText, false)) ) + || e -> key() == Key_F6 && trans.contains (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 a52ec42e..fc573bf6 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>450</width> <height>40</height> @@ -199,7 +199,7 @@ </spacer> <widget class="QLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -229,7 +229,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -410,7 +410,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp index 865a7f9e..1c6f8469 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->tqsetAlignment(Qt::AlignVCenter); + mw->queryField->setAlignment(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->tqsetAlignment(Qt::AlignVCenter | Qt::WordBreak); + mw->queryField->setAlignment(Qt::AlignVCenter | Qt::WordBreak); else - mw->queryField->tqsetAlignment(Qt::AlignVCenter); + mw->queryField->setAlignment(Qt::AlignVCenter); } diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui index 90822491..3ff31b5f 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SimpleQueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -64,7 +64,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>300</width> <height>16</height> @@ -115,7 +115,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> @@ -240,7 +240,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <grid> <property name="name"> @@ -340,7 +340,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui index 4d4ad6f5..0c7a5cb7 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>VerbQueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <hbox> <property name="name"> @@ -65,7 +65,7 @@ </widget> <widget class="QLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout30</cstring> + <cstring>layout30</cstring> </property> <hbox> <property name="name"> @@ -73,7 +73,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <grid> <property name="name"> @@ -163,7 +163,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout27</cstring> + <cstring>layout27</cstring> </property> <grid> <property name="name"> @@ -269,7 +269,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -309,7 +309,7 @@ </widget> <widget class="QLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <grid> <property name="name"> @@ -317,7 +317,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <grid> <property name="name"> @@ -516,7 +516,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>390</width> <height>16</height> @@ -541,7 +541,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui index cba2407b..669ec746 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -214,5 +214,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui index 46a49a9e..7964f7e0 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -70,7 +70,7 @@ <property name="name"> <cstring>StatListView</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>0</height> @@ -82,5 +82,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/tools/extractlang.cpp b/kvoctrain/kvoctrain/tools/extractlang.cpp index c56308e9..a775274e 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.tqcontains(" ")) { + if (!two.contains(" ")) { twoLangs.append("\t{{\""); twoLangs.append(two); twoLangs.append("\"}, {\""); @@ -96,7 +96,7 @@ bool parseTR(TQString& line, TQTextIStream& in) uint count = 0; - while (line.tqcontains("<td")) + while (line.contains("<td")) { if (count > 3) return true; @@ -111,7 +111,7 @@ bool parseTR(TQString& line, TQTextIStream& in) parseLanguage(text[0], text[2], text[3]); } - if (line.tqcontains("/tr")) + if (line.contains("/tr")) return true; return false; @@ -130,7 +130,7 @@ int main() if (readNext) line = in.readLine(); - if (line.tqcontains("<tr")) + if (line.contains("<tr")) { readNext = parseTR(line, in); } |