From 648ba4a456d3aad2825193ff8f3bd52a875783b5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:18:52 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1212481 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kanagram/src/kanagram.cpp | 50 ++++++++++++++++++------------------- kanagram/src/keduvocdocument.cpp | 2 +- kanagram/src/keduvocdocument.h | 4 +-- kanagram/src/keduvocexpression.h | 2 +- kanagram/src/keduvockvtmlreader.cpp | 2 +- kanagram/src/leitnersystem.cpp | 4 +-- kanagram/src/leitnersystemview.cpp | 2 +- kanagram/src/mainsettings.cpp | 2 +- kanagram/src/mainsettingswidget.ui | 10 ++++---- kanagram/src/newstuffwidget.ui | 6 ++--- kanagram/src/vocabedit.cpp | 4 +-- kanagram/src/vocabeditwidget.ui | 20 +++++++-------- kanagram/src/vocabsettingswidget.ui | 8 +++--- 13 files changed, 58 insertions(+), 58 deletions(-) (limited to 'kanagram') diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index 3a03b6e8..42cb90f9 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -225,7 +225,7 @@ void Kanagram::paintEvent(TQPaintEvent *) p.setPen(TQPen(black, 3)); //Draw the border of the input box - TQRect borderRect = m_inputBox->tqgeometry(); + TQRect borderRect = m_inputBox->geometry(); borderRect.setLeft(borderRect.left() - 2); borderRect.setTop(borderRect.top() - 2); borderRect.setWidth(borderRect.width() + 2 * 1); @@ -377,7 +377,7 @@ TQRect Kanagram::innerRect(const TQRect &rect, const int xMargin, const int yMar void Kanagram::mousePressEvent(TQMouseEvent *e) { - if (m_nextRect.tqcontains(e->pos())) + if (m_nextRect.contains(e->pos())) { hideHint(); m_game->nextAnagram(); @@ -386,51 +386,51 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) update(); } - if(m_configRect.tqcontains(e->pos())) + if(m_configRect.contains(e->pos())) { showSettings(); } - if(m_quitRect.tqcontains(e->pos())) + if(m_quitRect.contains(e->pos())) { kapp->quit(); } - if(m_revealRect.tqcontains(e->pos())) + if(m_revealRect.contains(e->pos())) { m_game->restoreWord(); update(); } - if(m_logoRect.tqcontains(e->pos())) + if(m_logoRect.contains(e->pos())) { m_helpMenu->aboutApplication(); } if(!m_showHint && m_overHelp) { - if(m_handbookRect.tqcontains(e->pos())) + if(m_handbookRect.contains(e->pos())) { m_helpMenu->appHelpActivated(); } - if(m_aboutKDERect.tqcontains(e->pos())) + if(m_aboutKDERect.contains(e->pos())) { m_helpMenu->aboutKDE(); } - if(m_aboutAppRect.tqcontains(e->pos())) + if(m_aboutAppRect.contains(e->pos())) { m_helpMenu->aboutApplication(); } } - if(m_hintBoxRect.tqcontains(e->pos())) + if(m_hintBoxRect.contains(e->pos())) { hideHint(); } - if(m_switcherRect.tqcontains(e->pos()) || m_arrowRect.tqcontains(e->pos())) + if(m_switcherRect.contains(e->pos()) || m_arrowRect.contains(e->pos())) { if(!(e->button() == RightButton)) m_game->nextVocab(); @@ -444,7 +444,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) update(); } - if(m_hintRect.tqcontains(e->pos())) + if(m_hintRect.contains(e->pos())) { if(m_showHint == true) m_showHint = false; else @@ -459,7 +459,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) update(); } - if(m_upRect.tqcontains(e->pos()) && m_inputBox->text() != "") + if(m_upRect.contains(e->pos()) && m_inputBox->text() != "") { if(m_inputBox->text().lower().stripWhiteSpace() == m_game->getWord()) { @@ -492,7 +492,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) bool haveToUpdate; haveToUpdate = false; - if (m_nextRect.tqcontains(p)) + if (m_nextRect.contains(p)) { if (!m_overNext) { @@ -506,7 +506,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_configRect.tqcontains(p)) + if(m_configRect.contains(p)) { if(!m_overConfig) { @@ -520,7 +520,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_helpRect.tqcontains(p)) + if(m_helpRect.contains(p)) { if(!m_overHelp) { @@ -534,7 +534,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_quitRect.tqcontains(p)) + if(m_quitRect.contains(p)) { if(!m_overQuit) { @@ -548,7 +548,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_hintRect.tqcontains(p)) + if(m_hintRect.contains(p)) { if(!m_overHint) { @@ -562,7 +562,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_hintBoxRect.tqcontains(p)) + if(m_hintBoxRect.contains(p)) { if(!m_overHintBox) { @@ -576,7 +576,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_revealRect.tqcontains(p)) + if(m_revealRect.contains(p)) { if(!m_overReveal) { @@ -590,7 +590,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_upRect.tqcontains(p)) + if(m_upRect.contains(p)) { if(!m_overUp) { @@ -604,7 +604,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_switcherRect.tqcontains(p) || m_arrowRect.tqcontains(p)) + if(m_switcherRect.contains(p) || m_arrowRect.contains(p)) { if(!m_overSwitcher) { @@ -618,7 +618,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_aboutAppRect.tqcontains(p)) + if(m_aboutAppRect.contains(p)) { if(!m_overAboutApp) { @@ -634,7 +634,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) if(!m_showHint) { - if(m_handbookRect.tqcontains(p)) + if(m_handbookRect.contains(p)) { if(!m_overHandbook) { @@ -648,7 +648,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_aboutKDERect.tqcontains(p)) + if(m_aboutKDERect.contains(p)) { if(!m_overAboutKDE) { diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp index 6d4eeaea..4bfe29fc 100644 --- a/kanagram/src/keduvocdocument.cpp +++ b/kanagram/src/keduvocdocument.cpp @@ -972,7 +972,7 @@ KEduVocDocument::FileType KEduVocDocument::detectFT(const TQString &filename) TQDataStream is( &f ); - TQ_INT8 c1, c2, c3, c4, c5; + Q_INT8 c1, c2, c3, c4, c5; is >> c1 >> c2 >> c3 diff --git a/kanagram/src/keduvocdocument.h b/kanagram/src/keduvocdocument.h index b2dc021c..ebc48010 100644 --- a/kanagram/src/keduvocdocument.h +++ b/kanagram/src/keduvocdocument.h @@ -226,7 +226,7 @@ #define KV_CON_P3PF "p3f" // 3. person plural female #define KV_CON_P3PM "p3m" // 3. person plural male #define KV_CON_P3PN "p3n" // 3. person plural natural -#define KV_CONJ_COMMON "common" // female tqcontains common for all three +#define KV_CONJ_COMMON "common" // female contains common for all three #define LEX_IDENT_50 "Vocabulary Trainer V5.0" @@ -246,7 +246,7 @@ class MultipleChoice; class LeitnerSystem; /************************************************************* - * This class tqcontains the expressions of your vocabulary + * This class contains the expressions of your vocabulary ************************************************************/ class KEduVocDocument : public QObject diff --git a/kanagram/src/keduvocexpression.h b/kanagram/src/keduvocexpression.h index e5022c8b..eb3ac4ec 100644 --- a/kanagram/src/keduvocexpression.h +++ b/kanagram/src/keduvocexpression.h @@ -58,7 +58,7 @@ typedef signed char grade_t; typedef unsigned short count_t; /*************************************************************** - * This class tqcontains one expression as original or in one + * This class contains one expression as original or in one * translations **************************************************************/ diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp index 38382560..fc1441f6 100644 --- a/kanagram/src/keduvockvtmlreader.cpp +++ b/kanagram/src/keduvockvtmlreader.cpp @@ -1670,7 +1670,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem) TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path()); TQString format = i18n( - "Your document tqcontains an unknown tag <%1>. " // keep trailing space + "Your document contains an unknown tag <%1>. " // keep trailing space "Maybe your version of KVocTrain is too old, " "or the document is damaged.\n" "Loading is aborted because KVocTrain cannot " diff --git a/kanagram/src/leitnersystem.cpp b/kanagram/src/leitnersystem.cpp index 3207d45a..0705c5c2 100644 --- a/kanagram/src/leitnersystem.cpp +++ b/kanagram/src/leitnersystem.cpp @@ -114,7 +114,7 @@ void LeitnerSystem::deleteBox( LeitnerBox* box ) bool LeitnerSystem::insertBox( const TQString& name, int correctWordBox, int wrongWordBox ) { - if( getBoxNameList().tqcontains( name ) != 0 ) + if( getBoxNameList().contains( name ) != 0 ) return false; LeitnerBox tmpBox; @@ -164,7 +164,7 @@ bool LeitnerSystem::setBoxName( LeitnerBox* box, const TQString& name ) bool LeitnerSystem::insertBox( const TQString& name ) { - if( getBoxNameList().tqcontains( name ) != 0 ) + if( getBoxNameList().contains( name ) != 0 ) return false; LeitnerBox tmpBox; diff --git a/kanagram/src/leitnersystemview.cpp b/kanagram/src/leitnersystemview.cpp index 1b8fc961..cbbb0400 100644 --- a/kanagram/src/leitnersystemview.cpp +++ b/kanagram/src/leitnersystemview.cpp @@ -116,7 +116,7 @@ void LeitnerSystemView::setSystem(LeitnerSystem* leitnersystem) //calculate the new sizes calculateSize(); updateContents(); - //tqrepaint + //repaint //update(); //TQPainter* p = new TQPainter(this); //drawContents( p, 0, 0, 0, 0 ); diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp index d9df6164..1e026758 100644 --- a/kanagram/src/mainsettings.cpp +++ b/kanagram/src/mainsettings.cpp @@ -109,7 +109,7 @@ void MainSettings::setupTranslations() temp_languages.remove(".."); for (TQStringList::const_iterator it2 = temp_languages.begin(); it2 != temp_languages.end(); ++it2 ) { - if (!languages.tqcontains(*it2)) languages.append(*it2); + if (!languages.contains(*it2)) languages.append(*it2); } } diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui index f9b9d79e..ef9d017e 100644 --- a/kanagram/src/mainsettingswidget.ui +++ b/kanagram/src/mainsettingswidget.ui @@ -4,7 +4,7 @@ MainSettingsWidget - + 0 0 @@ -86,7 +86,7 @@ - tqlayout2 + layout2 @@ -114,7 +114,7 @@ - tqlayout2 + layout2 @@ -165,7 +165,7 @@ Expanding - + 16 16 @@ -178,5 +178,5 @@ kcfg_hintHideTime kcfg_useSounds - + diff --git a/kanagram/src/newstuffwidget.ui b/kanagram/src/newstuffwidget.ui index 97a8896b..f1b1bb23 100644 --- a/kanagram/src/newstuffwidget.ui +++ b/kanagram/src/newstuffwidget.ui @@ -4,7 +4,7 @@ NewStuffWidget - + 0 0 @@ -41,7 +41,7 @@ the button to get new vocabulary files. Expanding - + 20 20 @@ -58,5 +58,5 @@ the button to get new vocabulary files. - + diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp index d7b7872a..46a81450 100644 --- a/kanagram/src/vocabedit.cpp +++ b/kanagram/src/vocabedit.cpp @@ -94,7 +94,7 @@ void VocabEdit::slotSave() TQString fileName; if(m_fileName == "") { - fileName = KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().tqreplace(" ", "") + ".kvtml"; + fileName = KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().replace(" ", "") + ".kvtml"; } else { @@ -102,7 +102,7 @@ void VocabEdit::slotSave() } doc->saveAs(this, KURL(fileName), KEduVocDocument::automatic, "kanagram"); - VocabSettings *settings = (VocabSettings*)this->tqparentWidget(); + VocabSettings *settings = (VocabSettings*)this->parentWidget(); settings->refreshView(); if(m_textChanged) diff --git a/kanagram/src/vocabeditwidget.ui b/kanagram/src/vocabeditwidget.ui index 00b471cd..d4d1229d 100644 --- a/kanagram/src/vocabeditwidget.ui +++ b/kanagram/src/vocabeditwidget.ui @@ -4,7 +4,7 @@ VocabEditWidget - + 0 0 @@ -21,7 +21,7 @@ - tqlayout7 + layout7 @@ -29,7 +29,7 @@ - tqlayout6 + layout6 @@ -55,7 +55,7 @@ - tqlayout8 + layout8 @@ -63,7 +63,7 @@ - tqlayout5 + layout5 @@ -80,7 +80,7 @@ txtDescription - The description of the vocabulary. If you're creating a new vocabulary, add a description so that users of your vocabulary will know what kinds of words it tqcontains. + The description of the vocabulary. If you're creating a new vocabulary, add a description so that users of your vocabulary will know what kinds of words it contains. @@ -111,7 +111,7 @@ - tqlayout7 + layout7 @@ -119,7 +119,7 @@ - tqlayout6 + layout6 @@ -161,7 +161,7 @@ - tqlayout4 + layout4 @@ -224,5 +224,5 @@ btnClose lboxWords - + diff --git a/kanagram/src/vocabsettingswidget.ui b/kanagram/src/vocabsettingswidget.ui index 6bf9b26a..b329da4e 100644 --- a/kanagram/src/vocabsettingswidget.ui +++ b/kanagram/src/vocabsettingswidget.ui @@ -4,7 +4,7 @@ VocabSettingsWidget - + 0 0 @@ -21,7 +21,7 @@ - tqlayout3 + layout3 @@ -29,7 +29,7 @@ - tqlayout1 + layout1 @@ -113,5 +113,5 @@ createNew() - + -- cgit v1.2.1