diff options
Diffstat (limited to 'kiten')
| -rw-r--r-- | kiten/kiten.cpp | 16 | ||||
| -rw-r--r-- | kiten/learn.cpp | 20 | ||||
| -rw-r--r-- | kiten/rad.cpp | 2 | ||||
| -rw-r--r-- | kiten/widgets.cpp | 2 |
4 files changed, 20 insertions, 20 deletions
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index 781f684b..c7dc98eb 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -115,7 +115,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, n applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow"); connect(_ResultView, TQ_SIGNAL(linkClicked(const TQString &)), TQ_SLOT(ressearch(const TQString &))); - connect(kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(autoSearch())); + connect(tdeApp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(autoSearch())); TQTimer::singleShot(10, this, TQ_SLOT(finishInit())); } @@ -130,7 +130,7 @@ void TopLevel::finishInit() { // if it's the application's first time starting, // the app group won't exist and we show demo - if (!kapp->config()->hasGroup("app")) + if (!tdeApp->config()->hasGroup("app")) { if (kanjiCB->isChecked()) Edit->setText(TQString::fromUtf8("辞")); @@ -277,14 +277,14 @@ void TopLevel::handleSearchResult(Dict::SearchResult results) { //kdDebug() << "adding " << (*it).kanji() << endl; _ResultView->addResult(*it, common); - kapp->processEvents(); + tdeApp->processEvents(); } } else { for (TQValueListIterator<Dict::Entry> it = results.list.begin(); it != results.list.end(); ++it) { - kapp->processEvents(); + tdeApp->processEvents(); _ResultView->addKanjiResult(*it, results.common); } } @@ -293,7 +293,7 @@ void TopLevel::handleSearchResult(Dict::SearchResult results) { for (TQValueListIterator<Dict::Entry> it = results.list.begin(); it != results.list.end(); ++it) { - kapp->processEvents(); + tdeApp->processEvents(); _ResultView->addResult(*it, comCB->isChecked()); } } @@ -529,9 +529,9 @@ void TopLevel::gradeSearch() TQString TopLevel::clipBoardText() // gets text from clipboard for globalaccels { - kapp->clipboard()->setSelectionMode(true); - TQString text = kapp->clipboard()->text().stripWhiteSpace(); - kapp->clipboard()->setSelectionMode(false); + tdeApp->clipboard()->setSelectionMode(true); + TQString text = tdeApp->clipboard()->text().stripWhiteSpace(); + tdeApp->clipboard()->setSelectionMode(false); return text; } diff --git a/kiten/learn.cpp b/kiten/learn.cpp index c9c58435..cb647aa1 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -247,7 +247,7 @@ bool Learn::queryClose() void Learn::random() { - int rand = static_cast<int>(static_cast<float>(list.count()) / (static_cast<float>(RAND_MAX) / kapp->random())); + int rand = static_cast<int>(static_cast<float>(list.count()) / (static_cast<float>(RAND_MAX) / tdeApp->random())); current = list.at(rand - 1); update(); @@ -303,7 +303,7 @@ void Learn::update() for (TQValueListIterator<Dict::Entry> it = compounds.list.begin(); it != compounds.list.end(); ++it) { - kapp->processEvents(); + tdeApp->processEvents(); View->addResult(*it, true); } @@ -683,12 +683,12 @@ TQString Learn::randomMeaning(TQStringList &oldMeanings) do { - float rand = kapp->random(); + float rand = tdeApp->random(); if ((rand > (RAND_MAX / 2)) || (List->childCount() < numberOfAnswers)) { // get a meaning from dict //kdDebug() << "from our dict\n"; - rand = kapp->random(); + rand = tdeApp->random(); float rand2 = RAND_MAX / rand; rand = ((float)list.count() - 1) / rand2; //rand -= 1; @@ -711,7 +711,7 @@ TQString Learn::randomMeaning(TQStringList &oldMeanings) { // get a meaning from our list //kdDebug() << "from our list\n"; - rand = kapp->random(); + rand = tdeApp->random(); float rand2 = RAND_MAX / rand; rand = List->childCount() / rand2; @@ -749,7 +749,7 @@ void Learn::qupdate() newFont.setPixelSize(24); qKanji->setFont(newFont); - float rand = kapp->random(); + float rand = tdeApp->random(); float rand2 = RAND_MAX / rand; seikai = static_cast<int>(numberOfAnswers / rand2); @@ -787,10 +787,10 @@ void Learn::qnew() // new quiz kanji // use f(2) every third time, f(1) otherwise // where f(1) = numberOfItems * rand[0..1] // and f(2) = numberOfItems * rand[0..1] * rand[0..1] - // rand[0..1] = kapp->random() / RAND_MAX - float max = static_cast<float>(count) / (static_cast<float>(RAND_MAX) / kapp->random()); - if (kapp->random() < (static_cast<float>(RAND_MAX) / 3.25)) - max /= (static_cast<float>(RAND_MAX) / (kapp->random() + 1)); + // rand[0..1] = tdeApp->random() / RAND_MAX + float max = static_cast<float>(count) / (static_cast<float>(RAND_MAX) / tdeApp->random()); + if (tdeApp->random() < (static_cast<float>(RAND_MAX) / 3.25)) + max /= (static_cast<float>(RAND_MAX) / (tdeApp->random() + 1)); max = static_cast<int>(max); diff --git a/kiten/rad.cpp b/kiten/rad.cpp index a77afd16..cb73b51f 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -296,7 +296,7 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p connect(clear, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearSelected())); clear->setEnabled(false); - setCaption(kapp->makeStdCaption(i18n("Radical Selector"))); + setCaption(tdeApp->makeStdCaption(i18n("Radical Selector"))); strokesSpin->setValue(config->strokes()); strokesSpin->setFocus(); diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index 1fbdc262..f3fa8692 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -278,7 +278,7 @@ void ResultView::print(TQString title) printer.newPage(); page++; - kapp->processEvents(); + tdeApp->processEvents(); } while (true); } |