diff options
Diffstat (limited to 'kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp')
| -rw-r--r-- | kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp | 34 |
1 files changed, 19 insertions, 15 deletions
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) { |