diff options
Diffstat (limited to 'kvoctrain')
104 files changed, 542 insertions, 562 deletions
diff --git a/kvoctrain/kvoctrain/Makefile.am b/kvoctrain/kvoctrain/Makefile.am index 24aa6427..f053f0b7 100644 --- a/kvoctrain/kvoctrain/Makefile.am +++ b/kvoctrain/kvoctrain/Makefile.am @@ -40,8 +40,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/kvt-core -Icommon-dialogs \ bin_PROGRAMS = kvoctrain spotlight2kvtml # the library search path. -kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor CLEANFILES = *.i.c diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp index 7bdfe888..b00278a3 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp @@ -31,7 +31,7 @@ #include <tqprogressbar.h> #include <tqlabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* parent, const char* name) diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h index a6eff85c..80e78aa5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h @@ -34,7 +34,7 @@ class kvoctrainDoc; class ProgressDlg : public ProgressDlgForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp index 5ca5de2f..1d39a821 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp @@ -77,23 +77,23 @@ static ListRef date_itemlist [] = BlockOptions::BlockOptions(TQWidget* parent, const char* name, WFlags fl) : BlockOptionsBase(parent, name, fl) { - connect(expire1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire2, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block2, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire3, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block3, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire4, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block4, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire6, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block6, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire7, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block7, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - - connect(kcfg_Block, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotBlockToggled(bool))); - connect(kcfg_Expire, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExpireToggled(bool))); + connect(expire1, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block1, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire2, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block2, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire3, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block3, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire4, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block4, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire6, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block6, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire7, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block7, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + + connect(kcfg_Block, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotBlockToggled(bool))); + connect(kcfg_Expire, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExpireToggled(bool))); fillWidgets(); updateWidgets(); diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h index 4c051e87..b77fe2a0 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h @@ -35,7 +35,7 @@ class TQComboBox; class BlockOptions : public BlockOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h index d685cd58..e008b013 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h @@ -30,7 +30,7 @@ class GeneralOptions : public GeneralOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h index 0c221344..da504aaf 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h @@ -30,7 +30,7 @@ class GroupOptions : public GroupOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg index dd8732a5..f4c87806 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg @@ -27,7 +27,7 @@ </entry> <entry name="Separator" type="String"> <label>This sets the separator used when copying/pasting text, default is Tab</label> - <default code="true">QChar('\t')</default> + <default code="true">TQChar('\t')</default> </entry> <entry name="PasteOrder" type="StringList"> <label>The order in which languages get pasted</label> diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp index 05f9e590..ac7e1906 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <krestrictedline.h> #include <tdemessagebox.h> @@ -67,26 +67,26 @@ KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * les m_languageOptions = new LanguageOptions(m_langSet, 0, "Language Settings"); addPage(m_languageOptions, i18n("Languages"), "set_language", i18n("Language Settings"), true); - connect(m_languageOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(m_languageOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); m_viewOptions = new ViewOptions(0, "View Settings"); addPage(m_viewOptions, i18n("View"), "view_choose", i18n("View Settings"), true); m_pasteOptions = new PasteOptions(m_langSet, doc, 0, "Copy & Paste Settings"); addPage(m_pasteOptions, i18n("Copy & Paste"), "edit-paste", i18n("Copy & Paste Settings"), true); - connect(m_pasteOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(m_pasteOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); m_queryOptions = new QueryOptions(0, "Query Settings"); addPage(m_queryOptions, i18n("Query"), "run_query", i18n("Query Settings"), true); m_thresholdOptions = new ThresholdOptions(lessons, m_queryManager, 0, "Threshold Settings"); addPage(m_thresholdOptions, i18n("Thresholds"), "configure", i18n("Threshold Settings"), true); - connect(m_thresholdOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(m_thresholdOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); m_blockOptions = new BlockOptions(0, "Blocking Settings"); addPage(m_blockOptions, i18n("Blocking"), "configure", i18n("Blocking Settings"), true); - connect(m_blockOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); - connect(m_blockOptions, TQT_SIGNAL(blockExpireChanged(bool, bool)), m_thresholdOptions, TQT_SLOT(slotBlockExpire(bool, bool))); + connect(m_blockOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); + connect(m_blockOptions, TQ_SIGNAL(blockExpireChanged(bool, bool)), m_thresholdOptions, TQ_SLOT(slotBlockExpire(bool, bool))); setButtonGuiItem(KDialogBase::User1, KGuiItem(i18n("&Profiles..."))); setButtonTip(KDialogBase::User1, i18n("Save or load specific Query settings which consist in a profile")); @@ -143,7 +143,7 @@ void KVocTrainPrefs::slotUser1() if (showDlg) { ProfilesDialog * dlg = new ProfilesDialog(m_queryManager, this, 0, true); - connect(dlg, TQT_SIGNAL(profileActivated()), this, TQT_SLOT(updateWidgets())); + connect(dlg, TQ_SIGNAL(profileActivated()), this, TQ_SLOT(updateWidgets())); dlg->show(); } } diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h index ff4ac9e7..7e200aeb 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h @@ -40,7 +40,7 @@ class KComboBox; class KVocTrainPrefs : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index 197208d5..b04f1b9e 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -34,7 +34,7 @@ #include <tdelocale.h> #include <kcombobox.h> #include <dcopclient.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <tdemessagebox.h> @@ -682,14 +682,14 @@ LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char { langset_popup = 0; - connect(b_langDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteClicked())); - connect(b_langNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewClicked())); - connect(b_langPixmap, TQT_SIGNAL(clicked()), TQT_SLOT(slotPixmapClicked())); - connect(e_newName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotNewNameChanged(const TQString&))); - connect(d_shortName, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotShortActivated(const TQString&))); - connect(e_langLong, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLangChanged(const TQString&))); - connect(e_shortName2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotShort2Changed(const TQString&))); - connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); + connect(b_langDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteClicked())); + connect(b_langNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewClicked())); + connect(b_langPixmap, TQ_SIGNAL(clicked()), TQ_SLOT(slotPixmapClicked())); + connect(e_newName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotNewNameChanged(const TQString&))); + connect(d_shortName, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotShortActivated(const TQString&))); + connect(e_langLong, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotLangChanged(const TQString&))); + connect(e_shortName2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotShort2Changed(const TQString&))); + connect(d_kblayout, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotKeyboardLayoutChanged(const TQString&))); // Load the languages first, then the countries and create the // menus for the languages last, so they will have flags @@ -812,7 +812,7 @@ void LanguageOptions::enableLangWidgets() } else { - if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) + if (replyType == "TQStringList") { TQStringList layouts; TQDataStream stream(replyData, IO_ReadOnly); @@ -1032,7 +1032,7 @@ void LanguageOptions::loadCountryData() index = tag.findRev('.'); if (index != -1) tag.truncate(index); - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); @@ -1045,7 +1045,7 @@ void LanguageOptions::loadCountryData() int idx = 0; for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit) { - KSimpleConfig entry(*sit); + TDESimpleConfig entry(*sit); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); TQString submenu = entry.readEntry(TQString::fromLatin1("Region")); @@ -1099,11 +1099,11 @@ void LanguageOptions::loadCountryData() for (TQMap<TQString, Region>::Iterator it = regions.begin(); it != regions.end(); ++it) regmap.insert(it.data().region, it.data()); - connect(langset_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromGlobalActivated(int))); + connect(langset_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromGlobalActivated(int))); for (TQMap<TQString, Region>::Iterator it = regmap.begin(); it != regmap.end(); ++it) { TQPopupMenu *regpop = new TQPopupMenu(); - connect(regpop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromGlobalActivated(int))); + connect(regpop, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromGlobalActivated(int))); langset_popup->insertItem(it.key(), regpop); Region r = it.data(); @@ -1201,7 +1201,7 @@ void LanguageOptions::createISO6391Menus() if (it.key()[0].upper() != lang[0].upper()) { pop = new TQPopupMenu(); - connect(pop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromISO6391Activated(int))); + connect(pop, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromISO6391Activated(int))); iso6391_popup->insertItem(it.key()[0].upper(), pop, 1); } diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h index dbe5c83c..49ecfa41 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h @@ -33,7 +33,7 @@ class LanguageOptions : public LanguageOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui index 070f3308..1bc154cb 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui @@ -268,9 +268,6 @@ <property name="text"> <string>Add Language Data From ISO639-&1</string> </property> - <property name="accel"> - <string>Alt+1</string> - </property> <property name="toolTip" stdset="0"> <string>List of languages covered by ISO639-1</string> </property> diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp index 31a5f768..a009e0bf 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp @@ -58,13 +58,13 @@ PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* pare SkipButton->setEnabled(!kcfg_UseCurrent->isChecked()); DownButton->setEnabled(!kcfg_UseCurrent->isChecked()); - connect(OrderList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(syncButtons())); - connect(DownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownButtonClicked())); - connect(SkipButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSkipButtonClicked())); - connect(UpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpButtonClicked())); + connect(OrderList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(syncButtons())); + connect(DownButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownButtonClicked())); + connect(SkipButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSkipButtonClicked())); + connect(UpButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpButtonClicked())); - connect(SeparatorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSeparatorComboActivated(int))); - connect(kcfg_UseCurrent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseCurrentDocToggled(bool))); + connect(SeparatorCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSeparatorComboActivated(int))); + connect(kcfg_UseCurrent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUseCurrentDocToggled(bool))); m_doc = doc; fillWidgets(); diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h index 9c404cbe..f804ecd4 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h @@ -33,7 +33,7 @@ class kvoctrainDoc; class PasteOptions : public PasteOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc b/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc index 6aeff9c7..8a5732e8 100644 --- a/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc +++ b/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc @@ -4,4 +4,4 @@ File=kvoctrain.kcfg ClassName=Prefs Singleton=true Mutators=true -Visibility=KDE_EXPORT
\ No newline at end of file +Visibility=TDE_EXPORT
\ No newline at end of file diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp index f898f754..c38a2065 100644 --- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp @@ -46,10 +46,10 @@ ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *parent, const char *n mw = new GroupOptions(this); setMainWidget(mw); - connect(mw->ps_del, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteGroup())); - connect(mw->ps_new, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewGroup())); - connect(mw->ps_recall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecallGroup())); - connect(mw->ps_store, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStoreGroup())); + connect(mw->ps_del, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteGroup())); + connect(mw->ps_new, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewGroup())); + connect(mw->ps_recall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRecallGroup())); + connect(mw->ps_store, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStoreGroup())); int ls = Prefs::numPreSetting(); for (int i = 0 ; i < ls; i++) diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h index 6f00c0d3..7a131d9b 100644 --- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h +++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h @@ -31,7 +31,7 @@ class QueryManager; class GroupOptions; -class KDE_EXPORT SettingsProfile +class TDE_EXPORT SettingsProfile { public: SettingsProfile(); @@ -43,9 +43,9 @@ public: TQString block_set; }; -class KDE_EXPORT ProfilesDialog : public KDialogBase +class TDE_EXPORT ProfilesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h index 7fd5ab72..e54bf906 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h @@ -30,7 +30,7 @@ class QueryOptions : public QueryOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp index 271bde65..5b81c32a 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp @@ -104,20 +104,20 @@ static ThreshListRef Threshdate_itemlist [] = ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent, const char* name, WFlags fl) : ThresholdOptionsBase(parent, name, fl), m_lessons(lessons) { - connect(lessoncomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetLessonComp(int))); - connect(lessonlist, TQT_SIGNAL(selectionChanged()), TQT_SIGNAL(widgetModified())); - connect(b_all_less, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectAll())); - connect(b_none_less, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectNone())); - connect(typecomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetTypeComp(int))); - connect(typelist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(gradecomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetGradeComp(int))); - connect(gradelist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(querycomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetQueryComp(int))); - connect(querylist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(badcomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetBadComp(int))); - connect(badlist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(datecomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetDateComp(int))); - connect(datelist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); + connect(lessoncomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetLessonComp(int))); + connect(lessonlist, TQ_SIGNAL(selectionChanged()), TQ_SIGNAL(widgetModified())); + connect(b_all_less, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectAll())); + connect(b_none_less, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectNone())); + connect(typecomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetTypeComp(int))); + connect(typelist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(gradecomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetGradeComp(int))); + connect(gradelist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(querycomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetQueryComp(int))); + connect(querylist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(badcomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetBadComp(int))); + connect(badlist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(datecomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetDateComp(int))); + connect(datelist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); m_queryManager = m; fillWidgets(); diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h index 781fe36b..b796c9ed 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h @@ -33,7 +33,7 @@ class KComboBox; class ThresholdOptions : public ThresholdOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h index 7c0bd29c..d40ac072 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h @@ -30,7 +30,7 @@ class ViewOptions : public ViewOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui index 7e77e918..ec3cdc54 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui @@ -205,9 +205,6 @@ <property name="text"> <string>&1</string> </property> - <property name="accel"> - <string>Alt+1</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 1</string> </property> @@ -268,9 +265,6 @@ <property name="text"> <string>&2</string> </property> - <property name="accel"> - <string>Alt+2</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 2</string> </property> @@ -312,9 +306,6 @@ <property name="text"> <string>&3</string> </property> - <property name="accel"> - <string>Alt+3</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 3</string> </property> @@ -337,9 +328,6 @@ <property name="text"> <string>&4</string> </property> - <property name="accel"> - <string>Alt+4</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 4</string> </property> @@ -362,9 +350,6 @@ <property name="text"> <string>&5</string> </property> - <property name="accel"> - <string>Alt+5</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 5</string> </property> @@ -387,9 +372,6 @@ <property name="text"> <string>&6</string> </property> - <property name="accel"> - <string>Alt+6</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 6</string> </property> @@ -412,9 +394,6 @@ <property name="text"> <string>&7</string> </property> - <property name="accel"> - <string>Alt+7</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 7</string> </property> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp index f1c8d62d..5d62f334 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp @@ -33,7 +33,7 @@ DocOptionsPage::DocOptionsPage(bool sort, TQWidget *parent, const char *name):Do sorter = sort; docsort->setChecked(sort); - connect( docsort, TQT_SIGNAL(toggled(bool)), TQT_SLOT(docSortToggled(bool)) ); + connect( docsort, TQ_SIGNAL(toggled(bool)), TQ_SLOT(docSortToggled(bool)) ); } void DocOptionsPage::docSortToggled(bool state) diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h index 5d1cc3fa..51c3e66a 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h @@ -31,7 +31,7 @@ class DocOptionsPage : public DocOptionsPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp index 9fcb088d..916e164b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp @@ -26,7 +26,7 @@ #include <tqlayout.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include "DocPropDlg.h" diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h index 0c34e403..e6e95b01 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h @@ -43,7 +43,7 @@ class LangPropPage; class DocPropsDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp index 48692758..187b6048 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp @@ -34,7 +34,7 @@ #include <tdeapplication.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kvoctraindoc.h> #include <langset.h> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h index 49140478..921c6a77 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h @@ -38,7 +38,7 @@ class LangSet; class DocPropsLangDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp index 646358f1..f17b68bd 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp @@ -51,25 +51,25 @@ LangPropPage::LangPropPage { l_langcode->setText(curr_lang); - connect( indef_female, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefFemaleChanged(const TQString&)) ); - connect( def_female, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defFemaleChanged(const TQString&)) ); - connect( def_male, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defMaleChanged(const TQString&)) ); - connect( indef_male, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefMaleChanged(const TQString&)) ); - connect( def_natural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defNaturalChanged(const TQString&)) ); - connect( indef_natural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefNaturalChanged(const TQString&)) ); - connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) ); - connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) ); - connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) ); - connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) ); - connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) ); - connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) ); - connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) ); - connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) ); - connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) ); - connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) ); - - connect( thirdS_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) ); - connect( thirdP_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) ); + connect( indef_female, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefFemaleChanged(const TQString&)) ); + connect( def_female, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defFemaleChanged(const TQString&)) ); + connect( def_male, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defMaleChanged(const TQString&)) ); + connect( indef_male, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefMaleChanged(const TQString&)) ); + connect( def_natural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defNaturalChanged(const TQString&)) ); + connect( indef_natural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefNaturalChanged(const TQString&)) ); + connect( first_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstSingularChanged(const TQString&)) ); + connect( first_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstPluralChanged(const TQString&)) ); + connect( second_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondSingularChanged(const TQString&)) ); + connect( second_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondPluralChanged(const TQString&)) ); + connect( thirdF_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFSingularChanged(const TQString&)) ); + connect( thirdF_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFPluralChanged(const TQString&)) ); + connect( thirdM_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMSingularChanged(const TQString&)) ); + connect( thirdM_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMPluralChanged(const TQString&)) ); + connect( thirdN_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNSingularChanged(const TQString&)) ); + connect( thirdN_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNPluralChanged(const TQString&)) ); + + connect( thirdS_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdSCommonToggled(bool)) ); + connect( thirdP_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdPCommonToggled(bool)) ); conjugations = conjug; diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h index f5934ac9..055f5673 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h @@ -35,7 +35,7 @@ class kvoctrainDoc; class LangPropPage : public LangPropPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp index 7d90f04b..b9457dd3 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp @@ -48,11 +48,11 @@ LessOptPage::LessOptPage : LessOptPageForm( parent, name ) { - connect( lessonList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotLessonChosen(int)) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewLesson()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyLesson()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteLesson()) ); - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); + connect( lessonList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotLessonChosen(int)) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewLesson()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyLesson()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteLesson()) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); doc = _doc; @@ -150,7 +150,7 @@ void LessOptPage::slotDeleteLesson() if (doc->getEntry(ent)->getLesson() == lessonIndex[act_lesson]+1) { KMessageBox::information(this, i18n("This lesson could not be deleted\nbecause it is in use."), - kapp->makeStdCaption(i18n("Deleting Lesson"))); + tdeApp->makeStdCaption(i18n("Deleting Lesson"))); return; } } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h index c834c242..8fbaabeb 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h @@ -36,7 +36,7 @@ class TQComboBox; class LessOptPage : public LessOptPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp index 2e6e893c..6b3921b0 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp @@ -46,11 +46,11 @@ TenseOptPage::TenseOptPage : TenseOptPageForm( parent, name ) { - connect( tenseList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTenseChosen(int)) ); - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteTense()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyTense()) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewTense()) ); + connect( tenseList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotTenseChosen(int)) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteTense()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyTense()) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewTense()) ); TQString str; for (int i = 0; i < (int) tenses.size(); i++) { @@ -156,7 +156,7 @@ void TenseOptPage::slotDeleteTense() if (conj.getType(con) == t) { KMessageBox::information(this, i18n("This user defined tense could not be deleted\nbecause it is in use."), - kapp->makeStdCaption(i18n("Deleting Tense Description"))); + tdeApp->makeStdCaption(i18n("Deleting Tense Description"))); return; } } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h index 524016dc..a6d9dccf 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h @@ -37,7 +37,7 @@ class TQStrList; class TenseOptPage : public TenseOptPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp index f7a30bf3..9292827a 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp @@ -64,10 +64,10 @@ TitlePage::TitlePage e_remark->setText (doc_remark); label_remark->setBuddy(e_remark); - connect( e_author, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAuthorChanged()) ); - connect( e_title, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTitleChanged(const TQString&)) ); - connect( e_license, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotLicenseChanged(const TQString&)) ); - connect( e_remark, TQT_SIGNAL(textChanged()), TQT_SLOT(slotDocRemarkChanged()) ); + connect( e_author, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAuthorChanged()) ); + connect( e_title, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTitleChanged(const TQString&)) ); + connect( e_license, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotLicenseChanged(const TQString&)) ); + connect( e_remark, TQ_SIGNAL(textChanged()), TQ_SLOT(slotDocRemarkChanged()) ); } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h index 90b11260..997b4213 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h @@ -31,7 +31,7 @@ class TitlePage : public TitlePageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp index 9b126b17..bb025e94 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp @@ -47,11 +47,11 @@ TypeOptPage::TypeOptPage TypeOptPageForm( parent, name ), doc(_doc) { - connect( typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTypeChosen(int)) ); - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteType()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyType()) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewType()) ); + connect( typeList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotTypeChosen(int)) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteType()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyType()) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewType()) ); TQString str; for (int i = 0; i < (int) types.size(); i++) { @@ -152,7 +152,7 @@ void TypeOptPage::slotDeleteType() if (exp->getType(lang) == t) { KMessageBox::information(this, i18n("This user defined type could not be deleted\nbecause it is in use."), - kapp->makeStdCaption(i18n("Deleting Type Description"))); + tdeApp->makeStdCaption(i18n("Deleting Type Description"))); return; } } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h index 0f9daa13..bb591bb5 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h @@ -36,7 +36,7 @@ class TQStrList; class TypeOptPage : public TypeOptPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp index 7e6dad66..1e36d74b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp @@ -48,11 +48,11 @@ UsageOptPage::UsageOptPage UsageOptPageForm( parent, name ), doc(_doc) { - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteUsage()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyUsage()) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewUsage()) ); - connect( usageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsageChosen(int)) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteUsage()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyUsage()) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewUsage()) ); + connect( usageList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotUsageChosen(int)) ); TQString str; for (int i = 0; i < (int) usages.size(); i++) { @@ -158,7 +158,7 @@ void UsageOptPage::slotDeleteUsage() i18n("usage (area) of an expression", "This user-defined usage label could not be deleted " "because it is in use."), - kapp->makeStdCaption(i18n("usage (area) of an expression", + tdeApp->makeStdCaption(i18n("usage (area) of an expression", "Deleting Usage Label"))); return; } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h index e7e1a2b1..8cf78607 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h @@ -38,7 +38,7 @@ class TQStrList; class UsageOptPage : public UsageOptPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp index 0bdae252..8a136d73 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp @@ -37,9 +37,9 @@ AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison { comparisons = comp; - connect( lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) ); - connect( lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) ); - connect( lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) ); + connect( lev1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev1Changed(const TQString&)) ); + connect( lev2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev2Changed(const TQString&)) ); + connect( lev3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev3Changed(const TQString&)) ); setData(multi_sel, comp); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h index 5e802ae9..659286b7 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h @@ -34,7 +34,7 @@ class EntryDlg; class AdjEntryPage : public AdjEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp index 87e0fe59..f75f4703 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp @@ -56,11 +56,11 @@ AuxInfoEntryPage::AuxInfoEntryPage remark_line->setMaximumHeight(sz*3); examp_line->setMaximumHeight(sz*3); - connect( para_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotParaSelected()) ); - connect( remark_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotRemarkSelected()) ); - connect( examp_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotExampSelected()) ); - connect( antonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAntonymSelected()) ); - connect( synonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotSynonymSelected()) ); + connect( para_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotParaSelected()) ); + connect( remark_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotRemarkSelected()) ); + connect( examp_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotExampSelected()) ); + connect( antonym_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAntonymSelected()) ); + connect( synonym_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotSynonymSelected()) ); setData(multi_sel, syno, anto, exam, rem, para); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h index fff6da8a..42d23f83 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h @@ -32,7 +32,7 @@ class EntryDlg; class AuxInfoEntryPage : public AuxInfoEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp index e4ce0679..254886bc 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp @@ -80,18 +80,18 @@ CommonEntryPage::CommonEntryPage ipafont(_ipafont) { - connect( b_usageDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeUsageDlg()) ); - connect( b_LessDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeLessDlg()) ); - connect( b_pronDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokePronDlg()) ); - connect( b_TypeDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeTypeDlg()) ); - connect( usage_box, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotUsageChanged()) ); - connect( lesson_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotLessonSelected(int)) ); - connect( subtype_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubTypeSelected(int)) ); - connect( type_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeSelected(int)) ); - connect( c_active, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveChanged(bool)) ); - - connect( pronunce_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotPronunceSelected(const TQString&)) ); - connect( expr_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotExprSelected(const TQString&)) ); + connect( b_usageDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeUsageDlg()) ); + connect( b_LessDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeLessDlg()) ); + connect( b_pronDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokePronDlg()) ); + connect( b_TypeDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeTypeDlg()) ); + connect( usage_box, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotUsageChanged()) ); + connect( lesson_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotLessonSelected(int)) ); + connect( subtype_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSubTypeSelected(int)) ); + connect( type_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeSelected(int)) ); + connect( c_active, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotActiveChanged(bool)) ); + + connect( pronunce_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotPronunceSelected(const TQString&)) ); + connect( expr_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotExprSelected(const TQString&)) ); usage_label->setTitle(i18n("Usage (area) of an Expression", "&Usage Labels")); pronunce_line->setFont(ipafont); @@ -329,7 +329,7 @@ void CommonEntryPage::invokePronDlg() { //if (phoneticDlg == 0) { PhoneticEntryPage * phoneticDlg = new PhoneticEntryPage (ipafont, this); - connect (phoneticDlg, TQT_SIGNAL(charSelected(wchar_t)), TQT_SLOT(phoneticSelected(wchar_t)) ); + connect (phoneticDlg, TQ_SIGNAL(charSelected(wchar_t)), TQ_SLOT(phoneticSelected(wchar_t)) ); phoneticDlg->show(); //} //else diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h index 4cbb8265..5021832a 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h @@ -36,7 +36,7 @@ class EntryDlg; class CommonEntryPage : public CommonEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp index 5fbcc71f..2bbee94e 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp @@ -176,23 +176,23 @@ EntryDlg::EntryDlg( updatePages (type); - connect(comm_page, TQT_SIGNAL(typeSelected(const TQString&)), TQT_SLOT(updatePages(const TQString&)) ); + connect(comm_page, TQ_SIGNAL(typeSelected(const TQString&)), TQ_SLOT(updatePages(const TQString&)) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotUndo()) ); - connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApply()) ); - connect( this, TQT_SIGNAL(user2Clicked()), this, TQT_SLOT(slotDockVertical()) ); - connect( this, TQT_SIGNAL(user3Clicked()), this, TQT_SLOT(slotDockHorizontal()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotUndo()) ); + connect( this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApply()) ); + connect( this, TQ_SIGNAL(user2Clicked()), this, TQ_SLOT(slotDockVertical()) ); + connect( this, TQ_SIGNAL(user3Clicked()), this, TQ_SLOT(slotDockHorizontal()) ); - connect (comm_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (aux_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (adj_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (mc_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (tense_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (comm_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (aux_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (adj_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (mc_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (tense_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); if (from_page != 0) - connect (from_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (from_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); if (to_page != 0) - connect (to_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (to_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); enableButtonApply(false); enableButton(User1, false); @@ -236,7 +236,7 @@ void EntryDlg::setData( const TQString &title, bool active) { - setCaption (kapp->makeStdCaption(title)); + setCaption (tdeApp->makeStdCaption(title)); TQString s; if (langset.findLongId(lang).isEmpty() ) diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h index 14f263bc..8d64542e 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h @@ -44,7 +44,7 @@ class kvoctrainDoc; class EntryDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp index a4bb55f1..8fc70db0 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp @@ -75,17 +75,17 @@ FromToEntryPage::FromToEntryPage monthnames.append (i18n("November")); monthnames.append (i18n("December")); - connect( bcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotBCount(const TQString&)) ); - connect( qcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotQCount(const TQString&)) ); - connect( fauxami_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFauxAmiSelected(const TQString&)) ); + connect( bcount_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotBCount(const TQString&)) ); + connect( qcount_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotQCount(const TQString&)) ); + connect( fauxami_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotFauxAmiSelected(const TQString&)) ); - connect( never, TQT_SIGNAL(clicked()), TQT_SLOT(slotNever()) ); - connect( today, TQT_SIGNAL(clicked()), TQT_SLOT(slotToday()) ); - connect( gradebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotGradeSelected(int)) ); + connect( never, TQ_SIGNAL(clicked()), TQ_SLOT(slotNever()) ); + connect( today, TQ_SIGNAL(clicked()), TQ_SLOT(slotToday()) ); + connect( gradebox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotGradeSelected(int)) ); - connect( year_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotYearChanged(int)) ); - connect( month_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotMonthChanged(int)) ); - connect( day_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDayChanged(int)) ); + connect( year_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotYearChanged(int)) ); + connect( month_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotMonthChanged(int)) ); + connect( day_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDayChanged(int)) ); year_spin->setData ((TQStringList *) 0, 1980, 2100); month_spin->setData (&monthnames, 1, 12); diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h index 6c2db738..2326b860 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h @@ -37,7 +37,7 @@ class EntryDlg; class FromToEntryPage : public FromToEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp index a6967704..1c028345 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp @@ -37,11 +37,11 @@ MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoic { multiplechoice = mc; - connect( mc1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc1Changed(const TQString&)) ); - connect( mc2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc2Changed(const TQString&)) ); - connect( mc3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc3Changed(const TQString&)) ); - connect( mc4Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc4Changed(const TQString&)) ); - connect( mc5Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc5Changed(const TQString&)) ); + connect( mc1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc1Changed(const TQString&)) ); + connect( mc2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc2Changed(const TQString&)) ); + connect( mc3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc3Changed(const TQString&)) ); + connect( mc4Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc4Changed(const TQString&)) ); + connect( mc5Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc5Changed(const TQString&)) ); setData(multi_sel, mc); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h index fe38ddc5..476a3694 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h @@ -34,7 +34,7 @@ class EntryDlg; class MCEntryPage : public MCEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index a7661be0..e710d2ef 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp @@ -189,7 +189,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co TQChar qc = uni_ref->code; TQString text = qc; PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this); - connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) ); + connect (butt, TQ_SIGNAL(clicked()), butt, TQ_SLOT(slotClicked()) ); TQString tip = i18n("Unicode name: "); tip += TQString::fromLatin1(uni_ref->unicodename); tip += "\n"; diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h index 6c3e0aec..34f91e3d 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h @@ -33,7 +33,7 @@ class PhoneticEntryPage : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ protected: class PhoneticButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp index c8c7d41e..e9f2f7c0 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp @@ -45,21 +45,21 @@ TenseEntryPage::TenseEntryPage : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook) { - connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) ); - connect( third_s_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) ); - connect( b_next, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextConj()) ); - connect( tensebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTenseSelected(int)) ); - - connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) ); - connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) ); - connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) ); - connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) ); - connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) ); - connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) ); - connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) ); - connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) ); - connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) ); - connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) ); + connect( third_p_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdPCommonToggled(bool)) ); + connect( third_s_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdSCommonToggled(bool)) ); + connect( b_next, TQ_SIGNAL(clicked()), TQ_SLOT(slotNextConj()) ); + connect( tensebox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTenseSelected(int)) ); + + connect( thirdN_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNPluralChanged(const TQString&)) ); + connect( thirdN_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNSingularChanged(const TQString&)) ); + connect( thirdM_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMPluralChanged(const TQString&)) ); + connect( thirdM_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMSingularChanged(const TQString&)) ); + connect( thirdF_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFPluralChanged(const TQString&)) ); + connect( thirdF_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFSingularChanged(const TQString&)) ); + connect( second_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondPluralChanged(const TQString&)) ); + connect( second_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondSingularChanged(const TQString&)) ); + connect( first_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstPluralChanged(const TQString&)) ); + connect( first_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstSingularChanged(const TQString&)) ); prefix = con_prefix; selection = ""; diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h index fdd7b347..9bfa4219 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h @@ -34,7 +34,7 @@ class EntryDlg; class TenseEntryPage : public TenseEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp index 66e1ca9a..a3a5860e 100644 --- a/kvoctrain/kvoctrain/kva_clip.cpp +++ b/kvoctrain/kvoctrain/kva_clip.cpp @@ -106,11 +106,11 @@ void kvoctrainApp::slotEditCopy() } if (!exp.isEmpty()) { #if defined(_WS_X11_) -// disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0); +// disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()),this,0); #endif TQApplication::clipboard()->setText(exp); #if defined(_WS_X11_) -// connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); +// connect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), this,TQ_SLOT(clipboardChanged())); #endif } diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp index 3df5d285..c729e172 100644 --- a/kvoctrain/kvoctrain/kva_config.cpp +++ b/kvoctrain/kvoctrain/kva_config.cpp @@ -34,7 +34,7 @@ void kvoctrainApp::saveOptions() { - TDEConfig *config = TDEApplication::kApplication()->config(); + TDEConfig *config = tdeApp->config(); fileOpenRecent->saveEntries(config, "Recent Files"); if (view) @@ -75,7 +75,7 @@ void kvoctrainApp::saveLanguages() void kvoctrainApp::readOptions() { - TDEConfig *config = TDEApplication::kApplication()->config(); + TDEConfig *config = tdeApp->config(); fileOpenRecent->loadEntries(config, "Recent Files"); /* int ls = Prefs::numPreSetting(); @@ -126,9 +126,9 @@ void kvoctrainApp::saveProperties(TDEConfig *config ) config->writeEntry(CFG_QUERYMODE, querymode); TQString filename=doc->URL().path(); - TQString tempname = kapp->tempSaveName(filename); + TQString tempname = tdeApp->tempSaveName(filename); saveDocProps(doc); - doc->saveAs(TQT_TQOBJECT(this), KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic); + doc->saveAs(this, KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic); } } @@ -142,31 +142,31 @@ void kvoctrainApp::readProperties(TDEConfig *config) bool modified = config->readBoolEntry(CFG_MODIFIED,false); if( modified ){ bool b_canRecover; - TQString tempname = kapp->checkRecoverFile(filename,b_canRecover); + TQString tempname = tdeApp->checkRecoverFile(filename,b_canRecover); if(b_canRecover){ - pdlg = new ProgressDlg(TQString(), TQString(), kapp->makeStdCaption("")); + pdlg = new ProgressDlg(TQString(), TQString(), tdeApp->makeStdCaption("")); pdlg->show(); - doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(tempname)); + doc = new kvoctrainDoc(this, KURL(tempname)); removeProgressBar(); doc->setModified(); doc->setTitle(title); doc->setURL(KURL(filename)); - setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); + setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified())); TQFile::remove(tempname); } } else if(!filename.isEmpty()){ pdlg = new ProgressDlg (TQString(), TQString(), - kapp->makeStdCaption("")); + tdeApp->makeStdCaption("")); pdlg->show(); - doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(filename)); + doc = new kvoctrainDoc(this, KURL(filename)); removeProgressBar(); - setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); + setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified())); } show(); - kapp->setTopWidget(this); - kapp->setMainWidget( this ); + tdeApp->setTopWidget(this); + tdeApp->setMainWidget( this ); } diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp index e7e716a8..0856a02c 100644 --- a/kvoctrain/kvoctrain/kva_header.cpp +++ b/kvoctrain/kvoctrain/kva_header.cpp @@ -36,7 +36,7 @@ #include <kcombobox.h> #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> static const char *SORT_ALPHA = I18N_NOOP("&Sort alphabetically"); @@ -52,8 +52,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header << 16) | IDH_SORT_COL_ALPHA); header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM); - connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m->exec(TQPoint (x, y)); return; @@ -89,8 +89,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ langs_m->insertItem(names[i], (header << 16) | (i << (16+8)) | IDH_SET_LANG); } - connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int))); - connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (langs_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetHeaderProp(int))); + connect (langs_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m = new TQPopupMenu(); @@ -142,8 +142,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ } } header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL); - connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (query_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (query_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available int j; @@ -167,16 +167,16 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m->insertItem(i18n("&Antonyms"), (header << 16) | IDH_START_ANTONYM); header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE); header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE); - connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (multiple_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (multiple_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m->insertSeparator(); header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA); header_m->insertItem(SmallIconSet("set_language"), i18n("Set &Language"), langs_m, (2 << 16) | IDH_NULL); } - connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m->exec(TQPoint(x, y)); } @@ -446,7 +446,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ msg = format.arg(name); int exit = KMessageBox::warningContinueCancel(this, msg, - kapp->makeStdCaption(""),KStdGuiItem::del()); + tdeApp->makeStdCaption(""),KStdGuiItem::del()); if(exit==KMessageBox::Continue) { doc->removeIdent(header1); view->setView (doc, langset); @@ -551,7 +551,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ msg = format.arg(name); int exit = KMessageBox::warningContinueCancel(this, msg, - kapp->makeStdCaption(""),i18n("Reset")); + tdeApp->makeStdCaption(""),i18n("Reset")); if(exit==KMessageBox::Continue) { doc->resetEntry (header1, act_lesson); doc->setModified(); diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index f4f36e70..67f4d97c 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -35,7 +35,7 @@ #include <kstatusbar.h> #include <tdepopupmenu.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include "prefs.h" @@ -90,159 +90,159 @@ kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name) querying = false; btimer = new TQTimer( this ); - connect( btimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOutBackup()) ); + connect( btimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeOutBackup()) ); if (Prefs::autoBackup()) - btimer->start(Prefs::backupTime() * 60 * 1000, TRUE); + btimer->start(Prefs::backupTime() * 60 * 1000, true); } void kvoctrainApp::initActions() { - fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); + fileNew = KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setToolTip(fileNew->whatsThis()); - fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); + fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, this, TQ_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); fileOpen->setWhatsThis(i18n("Open a vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns"); + fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, this, TQ_SLOT(slotGHNS()), actionCollection(), "file_ghns"); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setToolTip(fileGHNS->whatsThis()); - fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge"); + fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, this, TQ_SLOT(slotFileMerge()), actionCollection(), "file_merge"); fileMerge->setWhatsThis(i18n("Merge an existing vocabulary document with the current one")); fileMerge->setToolTip(fileOpen->whatsThis()); - fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); fileSave->setWhatsThis(i18n("Save the active vocabulary document")); fileSave->setToolTip(fileSave->whatsThis()); - fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs->setWhatsThis(i18n("Save the active vocabulary document with a different name")); fileSaveAs->setToolTip(fileSaveAs->whatsThis()); - filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); filePrint->setWhatsThis(i18n("Print the active vocabulary document")); filePrint->setToolTip(filePrint->whatsThis()); - fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); fileQuit->setWhatsThis(i18n("Quit KVocTrain")); fileQuit->setToolTip(fileQuit->whatsThis()); - editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); editCopy->setWhatsThis(i18n("Copy")); editCopy->setToolTip(editCopy->whatsThis()); - editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); editPaste->setWhatsThis(i18n("Paste")); editPaste->setToolTip(editPaste->whatsThis()); - editSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); + editSelectAll = KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection()); editSelectAll->setWhatsThis(i18n("Select all rows")); editSelectAll->setToolTip(editSelectAll->whatsThis()); - editClearSelection = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotCancelSelection()), actionCollection()); + editClearSelection = KStdAction::deselect(this, TQ_SLOT(slotCancelSelection()), actionCollection()); editClearSelection->setWhatsThis(i18n("Deselect all rows")); editClearSelection->setToolTip(editClearSelection->whatsThis()); - editSearchFromClipboard = KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotSmartSearchClip()), actionCollection()); + editSearchFromClipboard = KStdAction::find(this, TQ_SLOT(slotSmartSearchClip()), actionCollection()); editSearchFromClipboard->setWhatsThis(i18n("Search for the clipboard contents in the vocabulary")); editSearchFromClipboard->setToolTip(editSearchFromClipboard->whatsThis()); - editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", TQT_TQOBJECT(this), TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append"); + editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", this, TQ_SLOT(slotAppendRow()), actionCollection(),"edit_append"); editAppend->setWhatsThis(i18n("Append a new row to the vocabulary")); editAppend->setToolTip(editAppend->whatsThis()); - editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", TQT_TQOBJECT(this), TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area"); + editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", this, TQ_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area"); editEditSelectedArea->setWhatsThis(i18n("Edit the entries in the selected rows")); editEditSelectedArea->setToolTip(editEditSelectedArea->whatsThis()); - editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area"); + editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", this, TQ_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area"); editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows")); editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis()); - editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); + editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, this, TQ_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary")); editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis()); - vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics"); + vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, this, TQ_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics"); vocabShowStatistics->setWhatsThis(i18n("Show statistics for the current vocabulary")); vocabShowStatistics->setToolTip(vocabShowStatistics->whatsThis()); - vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons"); + vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, this, TQ_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons"); vocabAssignLessons->setWhatsThis(i18n("Create random lessons with unassigned entries")); vocabAssignLessons->setToolTip(vocabAssignLessons->whatsThis()); - vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up"); + vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, this, TQ_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up"); vocabCleanUp->setWhatsThis(i18n("Remove entries with same content from vocabulary")); vocabCleanUp->setToolTip(vocabCleanUp->whatsThis()); vocabAppendLanguage = new TDESelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language"); - connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabAppendLanguage())); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotAppendLang(int))); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int))); + connect(vocabAppendLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabAppendLanguage())); + connect (vocabAppendLanguage->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAppendLang(int))); + connect (vocabAppendLanguage->popupMenu(), TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); vocabSetLanguage = new TDESelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language"); - connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabSetLanguage())); + connect(vocabSetLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabSetLanguage())); vocabRemoveLanguage = new TDESelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language"); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabRemoveLanguage())); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderCallBack(int))); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int))); + connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabRemoveLanguage())); + connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); - vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); + vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, this, TQ_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); vocabDocumentProperties->setWhatsThis(i18n("Edit document properties")); vocabDocumentProperties->setToolTip(vocabAppendLanguage->whatsThis()); - vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties"); + vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, this, TQ_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties"); vocabLanguageProperties->setWhatsThis(i18n("Edit language properties in current document")); vocabLanguageProperties->setToolTip(vocabSetLanguage->whatsThis()); lessons = new KComboBox(this); lessons->setMinimumWidth(160); - connect(lessons, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotChooseLesson(int))); - lessons->setFocusPolicy(TQ_NoFocus); + connect(lessons, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotChooseLesson(int))); + lessons->setFocusPolicy(TQWidget::NoFocus); - vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "vocab_lessons"); + vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, this, 0, actionCollection(), "vocab_lessons"); vocabLessons->setWhatsThis(i18n("Choose current lesson")); vocabLessons->setToolTip(vocabLessons->whatsThis()); searchLine = new KLineEdit(this); - searchLine->setFocusPolicy(TQ_ClickFocus); - connect (searchLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchNext())); - connect (searchLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotResumeSearch(const TQString&))); + searchLine->setFocusPolicy(TQWidget::ClickFocus); + connect (searchLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearchNext())); + connect (searchLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotResumeSearch(const TQString&))); - vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "vocab_search"); + vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, this, 0, actionCollection(), "vocab_search"); vocabSearch->setAutoSized(true); vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text ")); vocabSearch->setToolTip(vocabSearch->whatsThis()); /* - learningResumeQuery = new TDEAction(i18n("Resume &Query..."), "run_query", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query"); + learningResumeQuery = new TDEAction(i18n("Resume &Query..."), "run_query", 0, this, TQ_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query"); //learningResumeQuery->setWhatsThis(i18n("")); learningResumeQuery->setToolTip(learningResumeQuery->whatsThis()); - learningResumeMultipleChoice = new TDEAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice"); + learningResumeMultipleChoice = new TDEAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQ_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice"); //learningResumeMultipleChoice->setWhatsThis(i18n("")); learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis()); */ - configApp = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotGeneralOptions()), actionCollection()); + configApp = KStdAction::preferences(this, TQ_SLOT( slotGeneralOptions()), actionCollection()); configApp->setWhatsThis(i18n("Show the configuration dialog")); configApp->setToolTip(configApp->whatsThis()); - /*configQueryOptions = new TDEAction(i18n("Configure &Query..."), "configure_query", 0, this, TQT_SLOT(slotQueryOptions()), actionCollection(),"config_query_options"); + /*configQueryOptions = new TDEAction(i18n("Configure &Query..."), "configure_query", 0, this, TQ_SLOT(slotQueryOptions()), actionCollection(),"config_query_options"); configQueryOptions->setWhatsThis(i18n("Show the query configuration dialog")); configQueryOptions->setToolTip(configQueryOptions->whatsThis());*/ actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusHelpMsg(const TQString &))); - //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQT_SLOT(slotActionHighlighted(TDEAction *, bool))); + connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), this, TQ_SLOT(slotStatusHelpMsg(const TQString &))); + //connect(actionCollection(), TQ_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQ_SLOT(slotActionHighlighted(TDEAction *, bool))); if (!initialGeometrySet()) resize( TQSize(550, 400).expandedTo(minimumSizeHint())); @@ -254,9 +254,9 @@ void kvoctrainApp::initActions() configToolbar->setToolTip(configToolbar->whatsThis()); learn_menu = (TQPopupMenu*) child( "learning", "TDEPopupMenu" ); - connect(learn_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); - connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn())); + connect(learn_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect(learn_menu, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); + connect(learn_menu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowLearn())); } @@ -280,14 +280,14 @@ void kvoctrainApp::initStatusBar() void kvoctrainApp::initDoc( ) { if (fileOpenRecent->items().count() > 0) - doc = new kvoctrainDoc(TQT_TQOBJECT(this), fileOpenRecent->items()[0]); + doc = new kvoctrainDoc(this, fileOpenRecent->items()[0]); else - doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL("")); + doc = new kvoctrainDoc(this, KURL("")); loadDocProps(doc); if (doc->numLangs() == 0) doc->appendLang("en"); - connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index f227b4ac..4ffeff2b 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -33,7 +33,7 @@ #include <tderecentdocument.h> #include <kstatusbar.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdenewstuff/downloaddialog.h> @@ -65,7 +65,7 @@ void kvoctrainApp::slotTimeOutBackup() slotFileSave(); } if (Prefs::backupTime() > 0) - btimer->start(Prefs::backupTime() * 60 * 1000, TRUE); + btimer->start(Prefs::backupTime() * 60 * 1000, true); slotStatusMsg(IDS_DEFAULT); } @@ -90,7 +90,7 @@ bool kvoctrainApp::queryExit() { int exit = KMessageBox::warningYesNoCancel(this, i18n("Vocabulary is modified.\n\nSave file before exit?\n"), - kapp->makeStdCaption(""), + tdeApp->makeStdCaption(""), KStdGuiItem::save(), KStdGuiItem::discard()); if (exit==KMessageBox::Yes) { save = true; // save and exit @@ -123,7 +123,7 @@ void kvoctrainApp::slotFileQuit() if(queryExit()) { doc->setModified(false); // Make sure not to bother about saving again. - kapp->quit(); + tdeApp->quit(); } else slotStatusMsg(IDS_DEFAULT); @@ -136,7 +136,7 @@ void kvoctrainApp::slotProgress(kvoctrainDoc *curr_doc, int percent) pdlg->setValue (curr_doc, percent); else if (pbar != 0) pbar->setValue (percent); - kapp->processEvents(); + tdeApp->processEvents(); } @@ -160,7 +160,7 @@ void kvoctrainApp::slotFileNew() view->setView (0, langset); delete doc; TQString name = ""; - doc = new kvoctrainDoc (TQT_TQOBJECT(this), 0 /*KURL(name)*/); + doc = new kvoctrainDoc (this, 0 /*KURL(name)*/); loadDocProps(doc); if (doc->numLangs() == 0) { TQString l = "en"; @@ -169,7 +169,7 @@ void kvoctrainApp::slotFileNew() view->setView(doc, langset); view->getTable()->setFont(Prefs::tableFont()); view->adjustContent(); - connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } slotStatusMsg(IDS_DEFAULT); @@ -202,7 +202,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) slotStatusMsg(msg); prepareProgressBar(); - doc = new kvoctrainDoc (TQT_TQOBJECT(this), url); + doc = new kvoctrainDoc (this, url); removeProgressBar(); loadDocProps(doc); view->setView(doc, langset); @@ -210,7 +210,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) view->adjustContent(); if (addRecent) fileOpenRecent->addURL(url) /*addRecentFile (url.path())*/; - connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } } @@ -253,8 +253,8 @@ void kvoctrainApp::slotFileMerge() slotStatusMsg(msg); prepareProgressBar(); - kvoctrainDoc *new_doc = new kvoctrainDoc (TQT_TQOBJECT(this), url); - connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + kvoctrainDoc *new_doc = new kvoctrainDoc (this, url); + connect (new_doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); removeProgressBar(); @@ -510,7 +510,7 @@ void kvoctrainApp::slotFileSave() prepareProgressBar(); saveDocProps(doc); - doc->saveAs(TQT_TQOBJECT(this), doc->URL(), doc->getTitle(), kvoctrainDoc::automatic); + doc->saveAs(this, doc->URL(), doc->getTitle(), kvoctrainDoc::automatic); fileOpenRecent->addURL(doc->URL()); removeProgressBar(); @@ -614,7 +614,7 @@ void kvoctrainApp::slotFileSaveAs() saveDocProps(doc); prepareProgressBar(); - doc->saveAs(TQT_TQOBJECT(this), url, doc->getTitle(), kvoctrainDoc::automatic); + doc->saveAs(this, url, doc->getTitle(), kvoctrainDoc::automatic); fileOpenRecent->addURL(doc->URL()); removeProgressBar(); } @@ -631,7 +631,7 @@ void kvoctrainApp::slotSaveSelection () slotStatusMsg(i18n("Saving selected area under new filename...")); TQString save_separator = Prefs::separator(); Prefs::setSeparator("\t"); - kvoctrainDoc seldoc(TQT_TQOBJECT(this), ""); + kvoctrainDoc seldoc(this, ""); // transfer most important parts seldoc.appendLang(doc->getOriginalIdent()); for (int i = 1; i < doc->numLangs(); i++) @@ -667,7 +667,7 @@ void kvoctrainApp::slotSaveSelection () saveDocProps(&seldoc); prepareProgressBar(); - seldoc.saveAs(TQT_TQOBJECT(this), url, i18n ("Part of: ") + doc->getTitle(), kvoctrainDoc::automatic); + seldoc.saveAs(this, url, i18n ("Part of: ") + doc->getTitle(), kvoctrainDoc::automatic); removeProgressBar(); } } diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp index 48c024f0..273b97f1 100644 --- a/kvoctrain/kvoctrain/kva_query.cpp +++ b/kvoctrain/kvoctrain/kva_query.cpp @@ -158,7 +158,7 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property) if (query_startnum == 0) { if( KMessageBox::Yes == KMessageBox::questionYesNo(this, i18n(not_contain), - kapp->makeStdCaption(i18n("Starting Query")))) + tdeApp->makeStdCaption(i18n("Starting Query")))) slotGeneralOptionsPage(5); return; } @@ -179,11 +179,11 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property) exp, doc); - connect( simpleQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); + connect( simpleQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); - connect( simpleQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutProperty(QueryDlgBase::Result))); + connect( simpleQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutProperty(QueryDlgBase::Result))); simpleQueryDlg->initFocus(); simpleQueryDlg->show(); @@ -208,7 +208,7 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res) if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), - kapp->makeStdCaption(i18n("Stopping Query"))); + tdeApp->makeStdCaption(i18n("Stopping Query"))); return; } else { @@ -329,7 +329,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) if (query_startnum == 0) { if( KMessageBox::Yes == KMessageBox::questionYesNo(this, i18n(not_contain), - kapp->makeStdCaption(i18n("Starting Query")))) + tdeApp->makeStdCaption(i18n("Starting Query")))) slotGeneralOptionsPage(5); return; } @@ -352,11 +352,11 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) exp->getConjugation(act_query_col)); verbQueryDlg->initFocus(); - connect( verbQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); + connect( verbQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); - connect(verbQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); + connect(verbQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result))); verbQueryDlg->show(); } else if (queryType == TQT_Articles) { @@ -370,10 +370,10 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) doc, doc->getArticle(act_query_col)); artQueryDlg->initFocus(); - connect( artQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); - connect(artQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); + connect( artQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); + connect(artQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result))); artQueryDlg->show(); } else if (queryType == TQT_Comparison) { @@ -387,11 +387,11 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) doc, exp->getComparison(act_query_col)); adjQueryDlg->initFocus(); - connect( adjQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); + connect( adjQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); - connect(adjQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); + connect(adjQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result))); adjQueryDlg->show(); } else { @@ -414,7 +414,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res) if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), - kapp->makeStdCaption(i18n("Stopping Query"))); + tdeApp->makeStdCaption(i18n("Stopping Query"))); return; } else { @@ -606,7 +606,7 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o if (query_startnum == 0) { if( KMessageBox::Yes == KMessageBox::questionYesNo(this, i18n(not_contain), - kapp->makeStdCaption(i18n("Starting Query")))) + tdeApp->makeStdCaption(i18n("Starting Query")))) slotGeneralOptionsPage(5); return; } @@ -642,10 +642,10 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o exp, doc); randomQueryDlg->initFocus(); - connect( randomQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); - connect(randomQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result))); + connect( randomQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); + connect(randomQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result))); randomQueryDlg->show(); } else if (queryType == TQT_Multiple) { @@ -661,10 +661,10 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o exp, doc); mcQueryDlg->initFocus(); - connect( mcQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); - connect(mcQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutMultipleChoice(QueryDlgBase::Result))); + connect( mcQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); + connect(mcQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutMultipleChoice(QueryDlgBase::Result))); mcQueryDlg->show(); } else { @@ -718,7 +718,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res) if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), - kapp->makeStdCaption(i18n("Stopping Query"))); + tdeApp->makeStdCaption(i18n("Stopping Query"))); return; } else { @@ -1016,6 +1016,6 @@ void kvoctrainApp::slotStopQuery(bool ) querying = false; querymode = false; show(); - kapp->setTopWidget(this); - kapp->setMainWidget( this ); + tdeApp->setTopWidget(this); + tdeApp->setMainWidget( this ); } diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index 5bcd011f..0b7dc77c 100644 --- a/kvoctrain/kvoctrain/kvoctrain.cpp +++ b/kvoctrain/kvoctrain/kvoctrain.cpp @@ -28,7 +28,7 @@ #include <kcombobox.h> #include <kprogress.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> @@ -180,7 +180,7 @@ void kvoctrainApp::commitEntryDlg(bool force) if( KMessageBox::No == KMessageBox::warningYesNo(this, i18n("The entry dialog contains unsaved changes.\n" "Do you want to apply or discard your changes?"), - kapp->makeStdCaption(i18n("Unsaved Changes")), + tdeApp->makeStdCaption(i18n("Unsaved Changes")), KStdGuiItem::apply(), KStdGuiItem::discard())) { return; } @@ -410,8 +410,8 @@ void kvoctrainApp::createEntryDlg(int row, int col) doc->getEntry(row)->isActive(), Prefs::iPAFont()); } - connect( entryDlg, TQT_SIGNAL(sigEditChoice(int)), - this, TQT_SLOT(slotEditCallBack(int))); + connect( entryDlg, TQ_SIGNAL(sigEditChoice(int)), + this, TQ_SLOT(slotEditCallBack(int))); view->getTable()->setReadOnly(true); @@ -651,7 +651,7 @@ void kvoctrainApp::slotDocProps () doc->setModified(); view->getTable()->updateContents(); - setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); + setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified())); TQApplication::restoreOverrideCursor(); slotStatusMsg(IDS_DEFAULT); @@ -672,7 +672,7 @@ void kvoctrainApp::slotDocPropsLang () doc->setModified(); view->getTable()->updateContents(); - setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); + setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified())); slotStatusMsg(IDS_DEFAULT); } @@ -681,7 +681,7 @@ void kvoctrainApp::slotDocPropsLang () void kvoctrainApp::slotModifiedDoc(bool mod) { - setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); + setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified())); slotStatusMsg(IDS_DEFAULT); } @@ -701,7 +701,7 @@ void kvoctrainApp::slotRemoveRow() if (!hasSelection()) { if( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the selected entry?\n"), - kapp->makeStdCaption(""),KStdGuiItem::del())) + tdeApp->makeStdCaption(""),KStdGuiItem::del())) { KVocTrainTable *table = view->getTable(); doc->removeEntry(table->currentRow()); @@ -712,7 +712,7 @@ void kvoctrainApp::slotRemoveRow() else { if(KMessageBox::Continue == KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the selected range?\n"), - kapp->makeStdCaption(""),KStdGuiItem::del())) + tdeApp->makeStdCaption(""),KStdGuiItem::del())) { KVocTrainTable *table = view->getTable(); @@ -895,14 +895,14 @@ void kvoctrainApp::slotCleanVocabulary () KMessageBox::information(this, s, - kapp->makeStdCaption(i18n("Clean Up"))); + tdeApp->makeStdCaption(i18n("Clean Up"))); } } void kvoctrainApp::slotCreateRandom() { - bool ok = FALSE; + bool ok = false; int res = KInputDialog::getInteger(i18n( "Entries in Lesson" ), i18n( "Enter number of entries in lesson:" ), Prefs::entriesPerLesson(), 1, 1000, 1, &ok, this ); if (!ok) @@ -961,7 +961,7 @@ void kvoctrainApp::slotGeneralOptions() void kvoctrainApp::slotGeneralOptionsPage(int index) { KVocTrainPrefs* dialog = new KVocTrainPrefs(langset, doc, lessons, &querymanager, this, "settings", Prefs::self() ); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyPreferences())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyPreferences())); if (index >= 0) dialog->selectPage(index); dialog->show(); @@ -1005,7 +1005,7 @@ void kvoctrainApp::slotAppendLang(int header_and_cmd) "Should this dialog be invoked now?"); if( KMessageBox::Yes == KMessageBox::questionYesNo(this, msg, - kapp->makeStdCaption(""),i18n("Invoke Dialog"), i18n("Do Not Invoke"))) + tdeApp->makeStdCaption(""),i18n("Invoke Dialog"), i18n("Do Not Invoke"))) { slotGeneralOptionsPage(1); } @@ -1149,8 +1149,8 @@ void kvoctrainApp::aboutToShowLearn() } header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL); - connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (query_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (query_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available @@ -1177,12 +1177,12 @@ void kvoctrainApp::aboutToShowLearn() header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE); header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE); - connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (multiple_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (multiple_m, TQ_SIGNAL(highlighted(int)), this, TQ_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(slotHeaderStatus(int))); + connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); TQString id = header == 0 ? doc->getOriginalIdent() : doc->getIdent(header); @@ -1263,8 +1263,8 @@ void kvoctrainApp::aboutToShowVocabSetLanguage() langs_m->insertItem(names[i], (header << 16) | (i << (16+8)) | IDH_SET_LANG); } - connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int))); - connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (langs_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetHeaderProp(int))); + connect (langs_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); if (header == 0) set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL); diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h index 689ab22d..48ad8b56 100644 --- a/kvoctrain/kvoctrain/kvoctrain.h +++ b/kvoctrain/kvoctrain/kvoctrain.h @@ -75,7 +75,7 @@ class KVTNewStuff; */ class kvoctrainApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index e9447654..5462c709 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -32,7 +32,7 @@ #include <dcopclient.h> #include <tdelocale.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include "kvoctraintable.h" @@ -61,13 +61,13 @@ KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *p m_pixInactive = TQPixmap(TDEGlobal::iconLoader()->loadIcon("no", TDEIcon::Small)); delayTimer = new TQTimer(this); - connect(delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(menuTriggerTimeout())); + connect(delayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(menuTriggerTimeout())); TQHeader *header = horizontalHeader(); - connect(header, TQT_SIGNAL(pressed(int)), this, TQT_SLOT(headerPressEvent(int))); - connect(header, TQT_SIGNAL(released(int)), this, TQT_SLOT(headerReleaseEvent(int))); + connect(header, TQ_SIGNAL(pressed(int)), this, TQ_SLOT(headerPressEvent(int))); + connect(header, TQ_SIGNAL(released(int)), this, TQ_SLOT(headerReleaseEvent(int))); - connect(this, TQT_SIGNAL(currentChanged(int, int)), this, TQT_SLOT(slotCurrentChanged(int, int))); + connect(this, TQ_SIGNAL(currentChanged(int, int)), this, TQ_SLOT(slotCurrentChanged(int, int))); } @@ -122,7 +122,7 @@ void KVocTrainTable::sortByColumn(int header, bool alpha) { if (m_doc && !m_doc->isAllowedSorting()) { KMessageBox::information(this, i18n("Sorting is currently turned off for this document.\n" - "\nUse the document properties dialog to turn sorting on."), kapp->makeStdCaption("")); + "\nUse the document properties dialog to turn sorting on."), tdeApp->makeStdCaption("")); return; } @@ -263,7 +263,7 @@ void KVocTrainTable::menuTriggerTimeout() if (mt != KV_COL_MARK) emit rightButtonClicked(mt, mpos.x(), mpos.y()); - TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), Qt::LeftButton, Qt::LeftButton); + TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), TQt::LeftButton, TQt::LeftButton); TQApplication::sendEvent(header, &me); } @@ -538,7 +538,7 @@ void KVocTrainTable::contentsMousePressEvent(TQMouseEvent * e) for (int i = topCell; i <= lastRowVisible; i++) updateCell(i, KV_COL_ORG); } - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) setCurrentCell(cr, cc); } diff --git a/kvoctrain/kvoctrain/kvoctraintable.h b/kvoctrain/kvoctrain/kvoctraintable.h index 5281ec7d..bd941179 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.h +++ b/kvoctrain/kvoctrain/kvoctraintable.h @@ -39,7 +39,7 @@ */ class KVocTrainTable : public TQTable { -Q_OBJECT +TQ_OBJECT public: public: diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp index 641a6852..565af26f 100644 --- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp +++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp @@ -106,7 +106,7 @@ TQWidget *KVocTrainTableItem::createEditor() const void KVocTrainTableItem::setContentFromEditor( TQWidget *w ) { if (m_doc != 0) { - if ( w->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQComboBox" ) ) { if (col() == KV_COL_MARK) { TQComboBox *statebox = (TQComboBox*) w; kvoctrainExpr *expr = m_doc->getEntry(row()); diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp index 600f27a7..ac73193d 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.cpp +++ b/kvoctrain/kvoctrain/kvoctrainview.cpp @@ -30,7 +30,7 @@ #include "prefs.h" #include "langset.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> #include <kdebug.h> @@ -59,13 +59,13 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp if (m_doc->numLangs() == 0) m_doc->appendLang(i18n("Original")); - connect(m_table, TQT_SIGNAL(selected(int)), m_table, TQT_SLOT(sortByColumn_alpha(int))); - connect(m_table, TQT_SIGNAL(rightButtonClicked(int, int, int)), parent, TQT_SLOT(slotHeaderMenu(int, int, int))); - connect(m_table, TQT_SIGNAL(edited(int, int)), parent, TQT_SLOT(slotEditEntry(int, int))); - connect(m_table, TQT_SIGNAL(currentChanged(int, int)), parent, TQT_SLOT(slotCurrentCellChanged(int, int))); - connect(m_table, TQT_SIGNAL(selectionChanged()), m_table, TQT_SLOT(slotSelectionChanged())); - connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQT_SLOT(keyPressEvent(TQKeyEvent *))); - connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *))); + connect(m_table, TQ_SIGNAL(selected(int)), m_table, TQ_SLOT(sortByColumn_alpha(int))); + connect(m_table, TQ_SIGNAL(rightButtonClicked(int, int, int)), parent, TQ_SLOT(slotHeaderMenu(int, int, int))); + connect(m_table, TQ_SIGNAL(edited(int, int)), parent, TQ_SLOT(slotEditEntry(int, int))); + connect(m_table, TQ_SIGNAL(currentChanged(int, int)), parent, TQ_SLOT(slotCurrentCellChanged(int, int))); + connect(m_table, TQ_SIGNAL(selectionChanged()), m_table, TQ_SLOT(slotSelectionChanged())); + connect(m_table, TQ_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQ_SLOT(keyPressEvent(TQKeyEvent *))); + connect(m_table, TQ_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQ_SLOT(keyReleaseEvent(TQKeyEvent *))); list_layout = new TQGridLayout( this, 2, 1/*, 4 */); list_layout->addWidget(m_table, 1, 0); diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h index 9630ffee..6e441111 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.h +++ b/kvoctrain/kvoctrain/kvoctrainview.h @@ -50,7 +50,7 @@ class LangSet; class kvoctrainView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.h b/kvoctrain/kvoctrain/kvt-core/LineList.h index a0bb1b24..323df053 100644 --- a/kvoctrain/kvoctrain/kvt-core/LineList.h +++ b/kvoctrain/kvoctrain/kvt-core/LineList.h @@ -28,12 +28,12 @@ #define LineList_h #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <vector> using namespace std; -class KDE_EXPORT LineList { +class TDE_EXPORT LineList { public: LineList (const TQString &multilines = ""); diff --git a/kvoctrain/kvoctrain/kvt-core/Makefile.am b/kvoctrain/kvoctrain/kvt-core/Makefile.am index e31da775..947a6c57 100644 --- a/kvoctrain/kvoctrain/kvt-core/Makefile.am +++ b/kvoctrain/kvoctrain/kvt-core/Makefile.am @@ -12,6 +12,6 @@ libkvoctraincore_la_SOURCES = langset.cpp LineList.cpp kvoctrainexpr.cpp \ SUBDIRS = kvt-xml -libkvoctraincore_la_LIBADD= $(all_libraries) $(KDE_RPATH) kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP +libkvoctraincore_la_LIBADD= $(all_libraries) $(KDE_RPATH) kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP noinst_HEADERS = grammarmanager.h diff --git a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h index c1fddd8c..e6776f29 100644 --- a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h +++ b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h @@ -28,11 +28,11 @@ #define MultipleChoice_included #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> #define MAX_MULTIPLE_CHOICE 5 // select one out of x -class KDE_EXPORT MultipleChoice +class TDE_EXPORT MultipleChoice { public: diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.h b/kvoctrain/kvoctrain/kvt-core/QueryManager.h index 4c2f2175..124e4dad 100644 --- a/kvoctrain/kvoctrain/kvt-core/QueryManager.h +++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.h @@ -105,7 +105,7 @@ struct QueryEntryRef { typedef vector<vector<QueryEntryRef> > QuerySelection; -class KDE_EXPORT QueryManager +class TDE_EXPORT QueryManager { public: // don´t change the order/remove one of these, diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h index 522c4ae8..2f674808 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h @@ -108,7 +108,7 @@ struct UsageRelation }; -class KDE_EXPORT UsageManager +class TDE_EXPORT UsageManager { public: diff --git a/kvoctrain/kvoctrain/kvt-core/grammarmanager.h b/kvoctrain/kvoctrain/kvt-core/grammarmanager.h index c37b0dbb..eea13bae 100644 --- a/kvoctrain/kvoctrain/kvt-core/grammarmanager.h +++ b/kvoctrain/kvoctrain/kvt-core/grammarmanager.h @@ -28,7 +28,7 @@ #define grammarmanager_included #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <vector> using namespace std; @@ -47,7 +47,7 @@ using namespace std; #define UL_USER_TENSE "#" // designates number of user tense -class KDE_EXPORT Article +class TDE_EXPORT Article { public: @@ -76,7 +76,7 @@ protected: }; -class KDE_EXPORT Comparison +class TDE_EXPORT Comparison { public: @@ -106,7 +106,7 @@ protected: }; -class KDE_EXPORT TenseRelation +class TDE_EXPORT TenseRelation { public: @@ -122,7 +122,7 @@ class KDE_EXPORT TenseRelation }; -class KDE_EXPORT Conjugation +class TDE_EXPORT Conjugation { public: diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp index 067fe6bd..af029b9e 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp @@ -33,7 +33,7 @@ #include <algorithm> using namespace std; -KDE_EXPORT vector<int> getCsvOrderStatic(kvoctrainDoc *doc) +TDE_EXPORT vector<int> getCsvOrderStatic(kvoctrainDoc *doc) { vector<int> csv_order; TQStringList lang_order = Prefs::pasteOrder(); @@ -286,7 +286,7 @@ void kvoctrainDoc::errorCsv (int /*line*/, const TQString &text ) { unknown_elem = true; TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Error in csv file")); + TQString s = tdeApp->makeStdCaption(i18n("Error in csv file")); TQString msg = text; KMessageBox::error( 0, msg, s); TQApplication::restoreOverrideCursor(); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp index aa158466..7e6b59e8 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp @@ -388,7 +388,7 @@ void kvoctrainDoc::errorLex (int /*line*/, const TQString &text ) { unknown_elem = true; TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Error in lex file")); + TQString s = tdeApp->makeStdCaption(i18n("Error in lex file")); TQString msg = text; KMessageBox::error(0, msg, s); TQApplication::restoreOverrideCursor(); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp index 3f33b25f..55973e75 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp @@ -837,7 +837,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name, TQString msg = format.arg(attr).arg(name); TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Unknown attribute")); + TQString s = tdeApp->makeStdCaption(i18n("Unknown attribute")); bool result = (KMessageBox::warningContinueCancel(0, ln+msg, s) == KMessageBox::Continue); TQApplication::restoreOverrideCursor(); return result; @@ -859,7 +859,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem ) ); TQString msg = format.arg(elem); TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Unknown element")); + TQString s = tdeApp->makeStdCaption(i18n("Unknown element")); KMessageBox::sorry(0, ln+msg, s); TQApplication::restoreOverrideCursor(); } @@ -868,7 +868,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem ) void kvoctrainDoc::errorKvtMl (int line, const TQString &text ) { TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Error")); + TQString s = tdeApp->makeStdCaption(i18n("Error")); TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); TQString msg = text; @@ -880,7 +880,7 @@ void kvoctrainDoc::errorKvtMl (int line, const TQString &text ) void kvoctrainDoc::warningKvtMl (int line, const TQString &text ) { TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Warning")); + TQString s = tdeApp->makeStdCaption(i18n("Warning")); TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); TQString msg = text; KMessageBox::information(0, ln+msg, s); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp index a3eca8e4..43ad8b7e 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp @@ -192,7 +192,7 @@ void kvoctrainDoc::errorVcb (int /*line*/, const TQString &text ) { unknown_elem = true; TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Error in vocabbox file")); + TQString s = tdeApp->makeStdCaption(i18n("Error in vocabbox file")); TQString msg = text; KMessageBox::error(0, msg, s); TQApplication::restoreOverrideCursor(); diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp index 5d0ec824..1139384d 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp @@ -97,7 +97,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url) if (!url.isEmpty()) doc_url = url; - connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) ); + connect( this, TQ_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQ_SLOT(slotProgress(kvoctrainDoc*,int)) ); TQString tmpfile; if (TDEIO::NetAccess::download( url, tmpfile, 0 )) @@ -168,7 +168,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url) TQString format = i18n("Could not load \"%1\"\nDo you want to try again?"); TQString msg = format.arg(url.path()); int result = KMessageBox::warningContinueCancel(0, msg, - kapp->makeStdCaption(i18n("I/O Failure")), + tdeApp->makeStdCaption(i18n("I/O Failure")), i18n("&Retry")); if ( result == KMessageBox::Cancel ) { Init(); @@ -189,7 +189,7 @@ kvoctrainDoc::~kvoctrainDoc() bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft) { - connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) ); + connect( this, TQ_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQ_SLOT(slotProgress(kvoctrainDoc*,int)) ); KURL tmp (url); if (title == i18n("Untitled")) @@ -264,7 +264,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F TQString format = i18n("Could not save \"%1\"\nDo you want to try again?"); TQString msg = format.arg(tmp.path()); int result = KMessageBox::warningContinueCancel(0, msg, - kapp->makeStdCaption(i18n("I/O Failure")), + tdeApp->makeStdCaption(i18n("I/O Failure")), i18n("&Retry")); if ( result == KMessageBox::Cancel ) return false; } @@ -472,7 +472,7 @@ void kvoctrainDoc::setSizeHint (int idx, const int width) } -class eraseTrans : public unary_function<kvoctrainExpr, void> +class eraseTrans : public function<void(kvoctrainExpr)> { public: @@ -516,7 +516,7 @@ void kvoctrainDoc::setOriginalIdent (const TQString &id) } -class sortByOrg : public binary_function<kvoctrainExpr, kvoctrainExpr, bool> +class sortByOrg : public function<bool(kvoctrainExpr, kvoctrainExpr)> { public: @@ -540,7 +540,7 @@ public: class sortByLessonAndOrg_alpha - : public binary_function<kvoctrainExpr, kvoctrainExpr, bool> + : public function<bool(kvoctrainExpr, kvoctrainExpr)> { public: @@ -573,7 +573,7 @@ public: class sortByLessonAndOrg_index - : public binary_function<kvoctrainExpr, kvoctrainExpr, bool> + : public function<bool(kvoctrainExpr, kvoctrainExpr)> { public: @@ -603,7 +603,7 @@ public: }; -class sortByTrans : public binary_function<kvoctrainExpr, kvoctrainExpr, bool> +class sortByTrans : public function<bool(kvoctrainExpr, kvoctrainExpr)> { public: @@ -675,7 +675,7 @@ bool kvoctrainDoc::sortByLesson_index () } -class resetAll : public unary_function<kvoctrainExpr, void> +class resetAll : public function<void(kvoctrainExpr)> { public: @@ -703,7 +703,7 @@ public: }; -class resetOne : public unary_function<kvoctrainExpr, void> +class resetOne : public function<void(kvoctrainExpr)> { public: diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h index 59c57986..e208a530 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h @@ -250,9 +250,9 @@ class MultipleChoice; * This class contains the expressions of your vocabulary ************************************************************/ -class KDE_EXPORT kvoctrainDoc : public TQObject +class TDE_EXPORT kvoctrainDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h index 72ff266f..21712e71 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h @@ -71,7 +71,7 @@ typedef unsigned short count_t; * translations **************************************************************/ -class KDE_EXPORT kvoctrainExpr +class TDE_EXPORT kvoctrainExpr { public: diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h index 26935408..bd91af01 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.h +++ b/kvoctrain/kvoctrain/kvt-core/langset.h @@ -33,10 +33,10 @@ using namespace std; #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT LangSet +class TDE_EXPORT LangSet { public: diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp index ee680f9c..b4b0d882 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.cpp +++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp @@ -12,9 +12,9 @@ #include <tqdir.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdenewstuff/entry.h> diff --git a/kvoctrain/kvoctrain/kvtnewstuff.h b/kvoctrain/kvoctrain/kvtnewstuff.h index fc7348ab..721af2d1 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.h +++ b/kvoctrain/kvoctrain/kvtnewstuff.h @@ -21,7 +21,7 @@ class kvoctrainApp; */ class KVTNewStuff : public TQObject, public TDENewStuff { -Q_OBJECT +TQ_OBJECT public: KVTNewStuff(TQWidget *parent = 0, const char *name = 0); diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp index 0fb0ec89..409daa01 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp @@ -30,7 +30,7 @@ #include <langset.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kprogress.h> @@ -55,18 +55,18 @@ AdjQueryDlg::AdjQueryDlg mw = new AdjQueryDlgForm(this); setMainWidget(mw); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); - connect(mw->lev1Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); - connect(mw->lev2Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); - connect(mw->lev3Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); + connect(mw->lev1Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); + connect(mw->lev2Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); + connect(mw->lev3Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); - connect(mw->lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) ); - connect(mw->lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) ); - connect(mw->lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) ); + connect(mw->lev1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev1Changed(const TQString&)) ); + connect(mw->lev2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev2Changed(const TQString&)) ); + connect(mw->lev3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev3Changed(const TQString&)) ); qtimer = 0; @@ -137,14 +137,14 @@ void AdjQueryDlg::setQuery(TQString, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -216,7 +216,7 @@ void AdjQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h index 89eba656..a3c81dcb 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h @@ -32,7 +32,7 @@ class AdjQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp index 1912d7b3..5ad656f6 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp @@ -28,7 +28,7 @@ #include <kv_resource.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdeapplication.h> #include <kprogress.h> @@ -61,14 +61,14 @@ ArtQueryDlg::ArtQueryDlg mw->artGroup->insert (mw->male); mw->artGroup->insert (mw->rb_fem); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); - connect(mw->natural, TQT_SIGNAL(clicked()), TQT_SLOT(slotNaturalClicked()) ); - connect(mw->male, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaleClicked()) ); - connect(mw->rb_fem, TQT_SIGNAL(clicked()), TQT_SLOT(slotFemClicked()) ); + connect(mw->natural, TQ_SIGNAL(clicked()), TQ_SLOT(slotNaturalClicked()) ); + connect(mw->male, TQ_SIGNAL(clicked()), TQ_SLOT(slotMaleClicked()) ); + connect(mw->rb_fem, TQ_SIGNAL(clicked()), TQ_SLOT(slotFemClicked()) ); setQuery (type, entry, col, query_cycle, query_num, query_startnum, exp, doc, articles); mw->countbar->setFormat("%v/%m"); @@ -158,14 +158,14 @@ void ArtQueryDlg::setQuery(TQString, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -253,7 +253,7 @@ void ArtQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h index 65f794c9..b801e6f3 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h @@ -32,7 +32,7 @@ class ArtQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp index 42a578f0..98ad7916 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp @@ -28,7 +28,7 @@ #include <kv_resource.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <kprogress.h> @@ -40,6 +40,7 @@ #include <tqpushbutton.h> #include <algorithm> +#include <random> using namespace std; MCQueryDlg::MCQueryDlg( @@ -64,15 +65,15 @@ MCQueryDlg::MCQueryDlg( mw->transgroup->insert(mw->rb_trans4); mw->transgroup->insert(mw->rb_trans5); - connect( mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect( mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); -// connect( verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect( mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showItClicked()) ); - connect( mw->rb_trans5, TQT_SIGNAL(clicked()), TQT_SLOT(trans5clicked()) ); - connect( mw->rb_trans4, TQT_SIGNAL(clicked()), TQT_SLOT(trans4clicked()) ); - connect( mw->rb_trans3, TQT_SIGNAL(clicked()), TQT_SLOT(trans3clicked()) ); - connect( mw->rb_trans2, TQT_SIGNAL(clicked()), TQT_SLOT(trans2clicked()) ); - connect( mw->rb_trans1, TQT_SIGNAL(clicked()), TQT_SLOT(trans1clicked()) ); + connect( mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect( mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); +// connect( verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect( mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showItClicked()) ); + connect( mw->rb_trans5, TQ_SIGNAL(clicked()), TQ_SLOT(trans5clicked()) ); + connect( mw->rb_trans4, TQ_SIGNAL(clicked()), TQ_SLOT(trans4clicked()) ); + connect( mw->rb_trans3, TQ_SIGNAL(clicked()), TQ_SLOT(trans3clicked()) ); + connect( mw->rb_trans2, TQ_SIGNAL(clicked()), TQ_SLOT(trans2clicked()) ); + connect( mw->rb_trans1, TQ_SIGNAL(clicked()), TQ_SLOT(trans1clicked()) ); qtimer = 0; @@ -121,14 +122,14 @@ void MCQueryDlg::setQuery(TQString org, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -137,13 +138,16 @@ void MCQueryDlg::setQuery(TQString org, mw->timebar->setEnabled(false); vector<TQString> strings; + random_device randomDev; + mt19937 randomGenerator(randomDev()); + button_ref.clear(); button_ref.push_back(RB_Label(mw->rb_trans1, mw->trans1)); button_ref.push_back(RB_Label(mw->rb_trans2, mw->trans2)); button_ref.push_back(RB_Label(mw->rb_trans3, mw->trans3)); button_ref.push_back(RB_Label(mw->rb_trans4, mw->trans4)); button_ref.push_back(RB_Label(mw->rb_trans5, mw->trans5)); - random_shuffle(button_ref.begin(), button_ref.end() ); + shuffle(button_ref.begin(), button_ref.end(), randomGenerator); resetButton(button_ref[0].rb, button_ref[0].label); resetButton(button_ref[1].rb, button_ref[1].label); resetButton(button_ref[2].rb, button_ref[2].label); @@ -155,7 +159,7 @@ void MCQueryDlg::setQuery(TQString org, MultipleChoice mc = exp->getMultipleChoice(q_tcol); for (unsigned i = 0; i < TQMIN(MAX_MULTIPLE_CHOICE, mc.size()); ++i) strings.push_back(mc.mc(i)); - std::random_shuffle(strings.begin(), strings.end()); + shuffle(strings.begin(), strings.end(), randomGenerator); // always include false friend TQString ff; @@ -349,7 +353,7 @@ void MCQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h index 86a77e74..4f8001ce 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h @@ -32,7 +32,7 @@ class MCQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h index 9e1b6184..b9a32245 100644 --- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h +++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h @@ -46,7 +46,7 @@ class TQRadioButton; class QueryDlgBase : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp index 42debac2..4accab3e 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp @@ -28,7 +28,7 @@ #include <kv_resource.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdeapplication.h> #include <kprogress.h> @@ -140,14 +140,14 @@ RandomQueryDlg::RandomQueryDlg( mw = new QueryDlgForm(this); setMainWidget(mw); - connect( mw->c_type, TQT_SIGNAL(clicked()), TQT_SLOT(slotTypeClicked()) ); - connect( mw->c_remark, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemClicked()) ); - connect( mw->c_falsefriend, TQT_SIGNAL(clicked()), TQT_SLOT(slotFFClicked()) ); - connect( mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect( mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect( mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect( mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); - connect( mw->show_more, TQT_SIGNAL(clicked()), TQT_SLOT(showMoreClicked()) ); + connect( mw->c_type, TQ_SIGNAL(clicked()), TQ_SLOT(slotTypeClicked()) ); + connect( mw->c_remark, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemClicked()) ); + connect( mw->c_falsefriend, TQ_SIGNAL(clicked()), TQ_SLOT(slotFFClicked()) ); + connect( mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect( mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect( mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect( mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); + connect( mw->show_more, TQ_SIGNAL(clicked()), TQ_SLOT(showMoreClicked()) ); mw->show_more -> setEnabled (Prefs::showMore()); mw->know_it -> setEnabled (Prefs::iKnow()); @@ -173,8 +173,8 @@ RandomQueryDlg::RandomQueryDlg( transCombos.at(i) -> setInsertionPolicy (TQComboBox::NoInsertion); transCombos.at(i) -> setDuplicatesEnabled (false); vb->addWidget(transCombos.at(i)); - connect (transCombos.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&))); - connect (transCombos.at(i) -> lineEdit(), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus())); + connect (transCombos.at(i), TQ_SIGNAL (textChanged (const TQString&)), TQ_SLOT (slotTransChanged (const TQString&))); + connect (transCombos.at(i) -> lineEdit(), TQ_SIGNAL (lostFocus()), TQ_SLOT (slotTransLostFocus())); } } else @@ -184,14 +184,14 @@ RandomQueryDlg::RandomQueryDlg( transFields.append (new TQLineEdit (mw->TranslationFrame, TQCString ("transField") + TQCString().setNum (i))); transFields.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth())); 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())); + connect (transFields.at(i), TQ_SIGNAL (textChanged (const TQString&)), TQ_SLOT (slotTransChanged (const TQString&))); + connect (transFields.at(i), TQ_SIGNAL (lostFocus()), TQ_SLOT (slotTransLostFocus())); } } kv_doc = 0; qtimer = 0; - //setCaption (kapp->makeStdCaption(i18n("Random Query"))); + //setCaption (tdeApp->makeStdCaption(i18n("Random Query"))); setQuery (org, trans, entry, orgcol, transcol, q_cycle, q_num, q_start, exp, doc); mw->countbar->setFormat("%v/%m"); mw->timebar->setFormat("%v"); @@ -201,10 +201,10 @@ RandomQueryDlg::RandomQueryDlg( ProgressDlg* pdlg = 0; if ( split && kv_doc -> numEntries() >= 500 ) { - pdlg = new ProgressDlg (TQString(), TQString(), kapp -> makeStdCaption (i18n("Loading Random Query"))); + pdlg = new ProgressDlg (TQString(), TQString(), tdeApp -> makeStdCaption (i18n("Loading Random Query"))); pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().height()); pdlg -> show(); - kapp -> processEvents(); + tdeApp -> processEvents(); } for ( i = 0; i < kv_doc -> numEntries(); i ++ ) { @@ -223,7 +223,7 @@ RandomQueryDlg::RandomQueryDlg( if ( pdlg ) { pdlg -> setValue (doc, i * 100 / kv_doc -> numEntries()); - kapp -> processEvents(); + tdeApp -> processEvents(); } } vocabulary.sort(); @@ -316,14 +316,14 @@ void RandomQueryDlg::setQuery(TQString org, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -486,7 +486,7 @@ void RandomQueryDlg::slotTransChanged(const TQString&) { mw->verify->setDefault(true); bool suggestions = Prefs::suggestions(); - if ( suggestions && sender() && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) -> isA (TQCOMBOBOX_OBJECT_NAME_STRING) ) + if ( suggestions && sender() && sender() -> isA ("TQComboBox") ) { TQLineEdit* edit = ((TQComboBox*) sender()) -> lineEdit(); resetField (edit); @@ -497,7 +497,7 @@ void RandomQueryDlg::slotTransChanged(const TQString&) else mw->status -> clear(); } - else if ( ! suggestions && sender() && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) -> isA (TQLINEEDIT_OBJECT_NAME_STRING) ) + else if ( ! suggestions && sender() && sender() -> isA ("TQLineEdit") ) resetField ((TQLineEdit*) sender()); } @@ -522,7 +522,7 @@ void RandomQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h index 0ab283af..dd8df997 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h @@ -37,7 +37,7 @@ class kvoctrainDoc; class RandomQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp index c5b40d09..91464fcb 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp @@ -33,7 +33,7 @@ #include <tqpushbutton.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kprogress.h> @@ -51,12 +51,12 @@ SimpleQueryDlg::SimpleQueryDlg( mw = new SimpleQueryDlgForm(this); setMainWidget(mw); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); - connect(mw->show_more, TQT_SIGNAL(clicked()), TQT_SLOT(showMoreClicked()) ); - connect(mw->answerField, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAnswerChanged()) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); + connect(mw->show_more, TQ_SIGNAL(clicked()), TQ_SLOT(showMoreClicked()) ); + connect(mw->answerField, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAnswerChanged()) ); kv_doc = 0; qtimer = 0; @@ -170,14 +170,14 @@ void SimpleQueryDlg::setQuery(QueryType _querytype, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -200,7 +200,7 @@ void SimpleQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h index 9027db4d..f32e95b9 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h @@ -32,7 +32,7 @@ class SimpleQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp index e7868a9e..05208fe4 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp @@ -28,7 +28,7 @@ #include <kv_resource.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kprogress.h> @@ -54,32 +54,32 @@ VerbQueryDlg::VerbQueryDlg mw = new VerbQueryDlgForm(this); setMainWidget(mw); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); - - connect(mw->p3pmField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3pnField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3snField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3smField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3pfField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3sfField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p2pField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p2sField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p1pField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p1sField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - - connect(mw->p3pmField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pmChanged(const TQString&)) ); - connect(mw->p3snField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3snChanged(const TQString&)) ); - connect(mw->p3pnField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pnChanged(const TQString&)) ); - connect(mw->p3smField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3smChanged(const TQString&)) ); - connect(mw->p3pfField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pfChanged(const TQString&)) ); - connect(mw->p3sfField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3sfChanged(const TQString&)) ); - connect(mw->p2pField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP2pChanged(const TQString&)) ); - connect(mw->p2sField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP2sChanged(const TQString&)) ); - connect(mw->p1pField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP1pChanged(const TQString&)) ); - connect(mw->p1sField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP1sChanged(const TQString&)) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); + + connect(mw->p3pmField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3pnField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3snField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3smField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3pfField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3sfField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p2pField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p2sField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p1pField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p1sField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + + connect(mw->p3pmField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pmChanged(const TQString&)) ); + connect(mw->p3snField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3snChanged(const TQString&)) ); + connect(mw->p3pnField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pnChanged(const TQString&)) ); + connect(mw->p3smField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3smChanged(const TQString&)) ); + connect(mw->p3pfField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pfChanged(const TQString&)) ); + connect(mw->p3sfField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3sfChanged(const TQString&)) ); + connect(mw->p2pField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP2pChanged(const TQString&)) ); + connect(mw->p2sField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP2sChanged(const TQString&)) ); + connect(mw->p1pField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP1pChanged(const TQString&)) ); + connect(mw->p1sField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP1sChanged(const TQString&)) ); qtimer = 0; @@ -146,14 +146,14 @@ void VerbQueryDlg::setQuery(TQString, if (mqtime > 0) { // more than 1000 milli-seconds if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -345,7 +345,7 @@ void VerbQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { @@ -367,7 +367,7 @@ void VerbQueryDlg::timeoutReached() } else if (Prefs::queryTimeout() == Prefs::EnumQueryTimeout::Continue) { next(); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); timercount = Prefs::maxTimePer(); } } @@ -395,7 +395,7 @@ void VerbQueryDlg::dontKnowClicked() if (current >= (int) conjugations.numEntries()-1 ) emit sigQueryChoice (Unknown); else { - qtimer->start(1000, TRUE); + qtimer->start(1000, true); timercount = Prefs::maxTimePer(); next(); } diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h index 5e114aa1..51574291 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h @@ -32,7 +32,7 @@ class VerbQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h index d01b837e..dc5b796c 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h +++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h @@ -33,7 +33,7 @@ class kvoctrainDoc; class GenStatPage : public GenStatPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h index e24272b8..fbe695ea 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h @@ -37,7 +37,7 @@ class GradeCols; class StatistikDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp index ae34d191..f6aa5a31 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp @@ -85,8 +85,8 @@ StatistikPage::StatistikPage(int col, kvoctrainDoc *_doc, TQWidget *parent, con } } setupPixmaps(); - connect(StatListView, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint& , int ) ), - this, TQT_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); + connect(StatListView, TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint& , int ) ), + this, TQ_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); } diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h index f622c16f..a8084a74 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h @@ -37,7 +37,7 @@ class GradeCols; class StatistikPage : public StatistikPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/tools/extractlang.mak b/kvoctrain/kvoctrain/tools/extractlang.mak index 740844df..2b4c2670 100755 --- a/kvoctrain/kvoctrain/tools/extractlang.mak +++ b/kvoctrain/kvoctrain/tools/extractlang.mak @@ -1,3 +1,3 @@ #!/bin/sh -g++ -I $QTDIR/include -L $QTDIR/lib extractlang.cpp -o extractlang -lqt +g++ -I $TQTDIR/include -L $TQTDIR/lib extractlang.cpp -o extractlang -lqt cat englangn.html | ./extractlang > languages.txt
\ No newline at end of file |