rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

blinken/src/blinken.cpp

@@ -289,13 +289,13 @@ void blinken::mousePressEvent(TQMouseEvent *e)
 		hsd->showLevel(1);
 		m_updateButtonHighlighting = true;
 	}
-	else if (m_showPreferences && m_fontRect.tqcontains(e -> pos()) && !m_alwaysUseNonCoolFont)
+	else if (m_showPreferences && m_fontRect.contains(e -> pos()) && !m_alwaysUseNonCoolFont)
 	{
 		blinkenSettings::setCustomFont(!blinkenSettings::customFont());
 		blinkenSettings::writeConfig();
 		update();
 	}
-	else if (m_showPreferences && m_soundRect.tqcontains(e -> pos()))
+	else if (m_showPreferences && m_soundRect.contains(e -> pos()))
 	{
 		blinkenSettings::setPlaySounds(!blinkenSettings::playSounds());
 		blinkenSettings::writeConfig();
@@ -316,9 +316,9 @@ void blinken::mousePressEvent(TQMouseEvent *e)
 	else if (m_game.phase() == blinkenGame::choosingLevel)
 	{
 		int level = 0;
-		if (m_levelsRect[1].tqcontains(e -> pos())) level = 1;
+		if (m_levelsRect[1].contains(e -> pos())) level = 1;
-		else if (m_levelsRect[0].tqcontains(e -> pos())) level = 2;
+		else if (m_levelsRect[0].contains(e -> pos())) level = 2;
-		else if (m_levelsRect[2].tqcontains(e -> pos())) level = 3;
+		else if (m_levelsRect[2].contains(e -> pos())) level = 3;
 		if (level) 
 		{
 			for(int i = 0; i < 3; i++) m_overLevels[i] = false;
@@ -665,7 +665,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 	m_updateButtonHighlighting = false;
 	haveToUpdate = false;
 	
-	if (m_highscoreRect.tqcontains(p))
+	if (m_highscoreRect.contains(p))
 	{
 		if (!m_overHighscore)
 		{
@@ -679,7 +679,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 	
-	if (m_menuRect.tqcontains(p))
+	if (m_menuRect.contains(p))
 	{
 		if (!m_overMenu)
 		{
@@ -699,7 +699,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 	}
 	else if (m_overMenu)
 	{
-		if (m_aboutKDERect.tqcontains(p))
+		if (m_aboutKDERect.contains(p))
 		{
 			if (!m_overAboutKDE)
 			{
@@ -709,7 +709,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 				haveToUpdate = true;
 			}
 		}
-		else if (m_aboutBlinkenRect.tqcontains(p))
+		else if (m_aboutBlinkenRect.contains(p))
 		{
 			if (!m_overAboutBlinken)
 			{
@@ -719,7 +719,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 				haveToUpdate = true;
 			}
 		}
-		else if (m_manualRect.tqcontains(p))
+		else if (m_manualRect.contains(p))
 		{
 			if (!m_overManual)
 			{
@@ -739,7 +739,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 		}
 	}
 	
-	if (!m_showPreferences && m_centralLettersRect.tqcontains(p))
+	if (!m_showPreferences && m_centralLettersRect.contains(p))
 	{
 		m_overCentralLetters = true;
 		haveToUpdate = true;
@@ -750,7 +750,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 	
-	if (m_showPreferences && m_soundRect.tqcontains(p))
+	if (m_showPreferences && m_soundRect.contains(p))
 	{
 		m_overSound = true;
 		haveToUpdate = true;
@@ -761,7 +761,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 	
-	if (m_showPreferences && m_fontRect.tqcontains(p) && !m_alwaysUseNonCoolFont)
+	if (m_showPreferences && m_fontRect.contains(p) && !m_alwaysUseNonCoolFont)
 	{
 		m_overFont = true;
 		haveToUpdate = true;
@@ -772,7 +772,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 	
-	if (m_counterRect.tqcontains(p))
+	if (m_counterRect.contains(p))
 	{
 		m_overCounter = true;
 		haveToUpdate = true;
@@ -783,7 +783,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 	
-	if (m_quitRect.tqcontains(p))
+	if (m_quitRect.contains(p))
 	{
 		if (!m_overQuit)
 		{
@@ -805,7 +805,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 		case blinkenGame::waiting1:
 		case blinkenGame::learningTheSequence:
 		case blinkenGame::typingTheSequence:
-			if (m_centralTextRect.tqcontains(p))
+			if (m_centralTextRect.contains(p))
 			{
 				if (!m_overCentralText)
 				{
@@ -823,7 +823,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p)
 		case blinkenGame::choosingLevel:
 			for (int i = 0; i < 3; i++)
 			{
-				if (m_levelsRect[i].tqcontains(p))
+				if (m_levelsRect[i].contains(p))
 				{
 					if (!m_overLevels[i])
 					{

kalzium/src/element.cpp

@@ -68,8 +68,8 @@ TQString Element::parsedOrbits( bool canBeEmpty )
 	TQString orbits = m_orbits;
 	TQRegExp rxs("([a-z])([0-9]+)");
 	TQRegExp rxb("([a-z]{2}) ",false);
-	orbits.tqreplace(rxs,"\\1<sup>\\2</sup>"); //superscript around electron number
+	orbits.replace(rxs,"\\1<sup>\\2</sup>"); //superscript around electron number
-	orbits.tqreplace(rxb,"<b>\\1</b> "); //bold around element symbols
+	orbits.replace(rxb,"<b>\\1</b> "); //bold around element symbols
 	return orbits;
 }
 

kalzium/src/eqchemview.cpp

@@ -89,8 +89,8 @@ void eqchemView::clear()
 void eqchemView::compute()
 {
     TQString equation( m_eqedit->text() );
-    equation.tqreplace("+", "+");
+    equation.replace("+", "+");
-    equation.tqreplace("->", " -> ");
+    equation.replace("->", " -> ");
     equation.append(" ");
     equation.prepend(" ");
     

kalzium/src/kalziumutils.cpp

@@ -38,7 +38,7 @@ int KalziumUtils::maxSize( const TQString& string, const TQRect& rect, TQFont fo
 		r = p->boundingRect( TQRect(), TQt::AlignAuto, string );
 		r.moveBy( rect.left(), rect.top() );
 		
-		if ( rect.tqcontains( r ) )
+		if ( rect.contains( r ) )
 			goodSizeFound = true;
 		else
 			size--;

kalzium/src/orbitswidget.cpp

@@ -162,20 +162,20 @@ void OrbitsWidget::getNumberOfOrbits()
 	int cut = 0;
 	bool cont = true;
 
-	if ( !o.tqcontains( rxb ) ) //only true for H and He
+	if ( !o.contains( rxb ) ) //only true for H and He
 		numOfElectrons.append( o.toInt() );
 	else //every other element
 	{
 		while ( cont )
 		{
 
-			pos = o.tqfind( rxb );
+			pos = o.find( rxb );
 			cut = o.length()-pos-1;
 			numOfElectrons.append(o.left( pos ).toInt());
 			o = o.right( cut );
 			num++;
 
-			if ( !o.tqcontains( rxb ) )
+			if ( !o.contains( rxb ) )
 			{
 				numOfElectrons.append( o.toInt() );
 				cont = false;

kanagram/Doxyfile

@@ -17,7 +17,7 @@ ABBREVIATE_BRIEF       = "The $name class" \
                          is \
                          provides \
                          specifies \
-                         tqcontains \
+                         contains \
                          represents \
                          a \
                          an \

kanagram/data/objects.kvtml

@@ -78,7 +78,7 @@ Valid xml means:
   <o r="Used to cook food" >cooker</o>
  </e>
  <e i="1" >
-  <o r="Keep warm by flame in cold weather" >fitqreplace</o>
+  <o r="Keep warm by flame in cold weather" >fireplace</o>
  </e>
  <e i="1" >
   <o r="Holds items above the floor" >table</o>

kanagram/src/kanagram.cpp

@@ -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() == Qt::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)
 			{

kanagram/src/kanagramgame.cpp

@@ -138,7 +138,7 @@ void KanagramGame::nextAnagram()
 	{
 		m_answeredWords.clear();
 	}
-	while(m_answeredWords.tqfindIndex(doc->getEntry(wordNumber)->getOriginal()) != -1)
+	while(m_answeredWords.findIndex(doc->getEntry(wordNumber)->getOriginal()) != -1)
 	{
 		wordNumber = m_random.getLong(totalWords);
 	}

kanagram/src/keduvocdocument.cpp

@@ -901,11 +901,11 @@ int KEduVocDocument::search(TQString substr, int id,
    if (id == 0) {
      for (int i = first; i < last; i++) {
        if (word_start) {
-         if (getEntry(i)->getOriginal().tqfind (substr, 0, false) == 0)  // case insensitive
+         if (getEntry(i)->getOriginal().find (substr, 0, false) == 0)  // case insensitive
            return i;
        }
        else {
-         if (getEntry(i)->getOriginal().tqfind (substr, 0, false) > -1)  // case insensitive
+         if (getEntry(i)->getOriginal().find (substr, 0, false) > -1)  // case insensitive
            return i;
        }
      }
@@ -913,11 +913,11 @@ int KEduVocDocument::search(TQString substr, int id,
    else {
      for (int i = first; i < last; i++) {
        if (word_start) {
-         if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) == 0) // case insensitive
+         if (getEntry(i)->getTranslation(id).find (substr, 0, false) == 0) // case insensitive
            return i;
        }
        else {
-         if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) > -1) // case insensitive
+         if (getEntry(i)->getTranslation(id).find (substr, 0, false) > -1) // case insensitive
            return i;
        }
      }
@@ -995,7 +995,7 @@ KEduVocDocument::FileType KEduVocDocument::detectFT(const TQString &filename)
    if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')
      return kvtml;
 
-   if (line.tqfind (VCB_SEPARATOR) >= 0)
+   if (line.find (VCB_SEPARATOR) >= 0)
      return vt_vcb;
 
    if (line == LEX_IDENT_50)

kanagram/src/keduvocexpression.cpp

@@ -55,7 +55,7 @@ KEduVocExpression::KEduVocExpression (TQString &s, TQString separator, int _less
   lesson = _lesson;
 
   if (separator.length() ) {
-    int pos = s.tqfind(separator);
+    int pos = s.find(separator);
 
     if (pos == -1) {
       setOriginal(s.stripWhiteSpace());
@@ -67,7 +67,7 @@ KEduVocExpression::KEduVocExpression (TQString &s, TQString separator, int _less
 //      s.stripWhiteSpace();
 
       // gather all translations
-      while ((pos = s.tqfind(separator)) != -1) {
+      while ((pos = s.find(separator)) != -1) {
         se = s.left(pos).stripWhiteSpace();
         addTranslation(se, KV_NORM_GRADE, KV_NORM_GRADE);
         s.remove (0, pos+separator.length() );

kanagram/src/keduvockvtmlreader.cpp

@@ -783,7 +783,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   if (!domAttrGrade.isNull())
   {
     TQString s = domAttrGrade.value();
-    if ((pos = s.tqfind(';')) >= 1)
+    if ((pos = s.find(';')) >= 1)
     {
       grade = s.left(pos).toInt();
       rev_grade = s.mid(pos+1, s.length()).toInt();
@@ -798,7 +798,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   if (!domAttrCount.isNull())
   {
     TQString s = domAttrCount.value();
-    if ((pos = s.tqfind(';')) >= 1)
+    if ((pos = s.find(';')) >= 1)
     {
       count = s.left(pos).toInt();
       rev_count = s.mid(pos+1, s.length()).toInt();
@@ -813,7 +813,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   if (!domAttrBad.isNull())
   {
     TQString s = domAttrBad.value();
-    if ((pos = s.tqfind(';')) >= 1)
+    if ((pos = s.find(';')) >= 1)
     {
       bcount = s.left(pos).toInt();
       rev_bcount = s.mid(pos+1, s.length()).toInt();
@@ -828,7 +828,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   if (!domAttrDate.isNull())
   {
     TQString s = domAttrDate.value();
-    if ((pos = s.tqfind(';')) >= 1)
+    if ((pos = s.find(';')) >= 1)
     {
       date = s.left(pos).toInt();
       rev_date = s.mid(pos+1, s.length()).toInt();
@@ -841,7 +841,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   if (!domAttrDate2.isNull())
   {
     TQString s = domAttrDate2.value();
-    if ((pos = s.tqfind(';')) >= 1)
+    if ((pos = s.find(';')) >= 1)
     {
       date = m_doc->decompressDate(s.left(pos));
       rev_date = m_doc->decompressDate(s.mid(pos+1, s.length()));
@@ -1633,7 +1633,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
   if (!domAttrGenerator.isNull())
   {
     m_doc->generator = domAttrGenerator.value();
-    int pos = m_doc->generator.tqfindRev (KVD_VERS_PREFIX);
+    int pos = m_doc->generator.findRev (KVD_VERS_PREFIX);
     if (pos >= 0)
     {
       m_doc->doc_version = m_doc->generator;

kanagram/src/keduvockvtmlwriter.cpp

@@ -781,7 +781,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato
 
     TQString s;
     TQString entype = s = (*first).getType(0);
-    int pos = s.tqfind (TQM_TYPE_DIV);
+    int pos = s.find (TQM_TYPE_DIV);
     if (pos >= 0)
       entype = s.left (pos);
     else
@@ -901,7 +901,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato
 
       TQString s;
       TQString entype = s = (*first).getType(0);
-      int pos = s.tqfind (TQM_TYPE_DIV);
+      int pos = s.find (TQM_TYPE_DIV);
       if (pos >= 0)
         entype = s.left (pos);
       else

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;
@@ -133,9 +133,9 @@ void LeitnerSystem::setSystemName( const TQString& name )
 
 int LeitnerSystem::getNumber( LeitnerBox* box )
 {
-	if( m_boxes.tqfindIndex( *box ) == -1 )
+	if( m_boxes.findIndex( *box ) == -1 )
 		kdDebug() << "muhaha" << endl;
-	return m_boxes.tqfindIndex( *box );
+	return m_boxes.findIndex( *box );
 }
 
 bool LeitnerSystem::setBoxName( int box, const TQString& name )
@@ -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;

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);
 		}
 	}
 	

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
 	{

kanagram/src/vocabeditwidget.ui

@@ -80,7 +80,7 @@
                                         <cstring>txtDescription</cstring>
                                     </property>
                                     <property name="whatsThis" stdset="0">
-                                        <string>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.</string>
+                                        <string>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.</string>
                                     </property>
                                 </widget>
                                 <widget class="TQLineEdit" row="0" column="1">

keduca/keduca/kgroupeduca.cpp

@@ -73,7 +73,7 @@ void KGroupEduca::clearAnswers()
     for( unsigned int i=0 ; i<maxButton ; ++i )
     {
         TQButton *tmpButton;
-        if( (tmpButton = tqfind(i)) )
+        if( (tmpButton = find(i)) )
             remove(tmpButton);
         delete tmpButton;
     }
@@ -87,13 +87,13 @@ bool KGroupEduca::isChecked(int id)
     {
     case Radio:
     {
-        KRadioEduca *tmpRadioButton = (KRadioEduca*) tqfind(id);
+        KRadioEduca *tmpRadioButton = (KRadioEduca*) find(id);
         if(tmpRadioButton != 0) return tmpRadioButton->isChecked();
     }
     break;
     case Check:
     {
-        KCheckEduca *tmpCheckButton = (KCheckEduca*) tqfind(id);
+        KCheckEduca *tmpCheckButton = (KCheckEduca*) find(id);
         if(tmpCheckButton != 0) return tmpCheckButton->isChecked();
     }
     break;

keduca/keducabuilder/kcontrolheader.cpp

@@ -261,10 +261,10 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo)
         TQString tag = *it;
         int index;
 
-        index = tag.tqfindRev('/');
+        index = tag.findRev('/');
         if (index != -1) tag = tag.mid(index + 1);
 
-        index = tag.tqfindRev('.');
+        index = tag.findRev('.');
         if (index != -1) tag.truncate(index);
 
         KSimpleConfig entry(*it);
@@ -287,9 +287,9 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo)
         TQString submenu = '-' + entry.readEntry(TQString::tqfromLatin1("Region"));
 
         TQString tag = *it;
-        int index = tag.tqfindRev('/');
+        int index = tag.findRev('/');
         tag.truncate(index);
-        index = tag.tqfindRev('/');
+        index = tag.findRev('/');
         tag = tag.mid(index+1);
         combo->insertLanguage(tag, name, sub, submenu);
     }

keduca/keducabuilder/ktagcombobox.cpp

@@ -105,12 +105,12 @@ int KTagComboBox::count() const
 
 static inline TQPopupMenu *checkInsertIndex(TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu, int *index)
 {
-    int pos = tags->tqfindIndex(submenu);
+    int pos = tags->findIndex(submenu);
 
     TQPopupMenu *pi = 0;
     if (pos != -1)
     {
-        TQMenuItem *p = popup->tqfindItem(popup->idAt(pos));
+        TQMenuItem *p = popup->findItem(popup->idAt(pos));
         pi = p?p->popup():0;
     }
     if (!pi) pi = popup;
@@ -183,7 +183,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
 
 bool KTagComboBox::containsTag( const TQString &str ) const
 {
-    return _tags->tqcontains(str) > 0;
+    return _tags->contains(str) > 0;
 }
 
 TQString KTagComboBox::currentTag() const
@@ -215,7 +215,7 @@ void KTagComboBox::setCurrentItem(int i)
 
 void KTagComboBox::setCurrentItem(const TQString &code)
 {
-    int i = _tags->tqfindIndex(code);
+    int i = _tags->findIndex(code);
     if (code.isNull())
         i = 0;
     if (i != -1)

keduca/libkeduca/fileread.cpp

@@ -905,7 +905,7 @@ void FileRead::setHeader( const TQString field, const TQString value)
     if( (_header[field]).isEmpty() )
         _header.insert( field, value );
     else
-        _header.tqreplace( field, value );
+        _header.replace( field, value );
 }
 
 /** is Multi Answer */

kgeography/src/askwidget.cpp

@@ -72,7 +72,7 @@ void askWidget::nextQuestion()
 	if (p_asked.count() < p_count)
 	{
 		aux = p_map -> getRandomDivision(isClickOnDivision());
-		while (p_asked.tqfind(aux) != p_asked.end()) aux = p_map -> getRandomDivision(isClickOnDivision());
+		while (p_asked.find(aux) != p_asked.end()) aux = p_map -> getRandomDivision(isClickOnDivision());
 		p_asked << aux;
 		nextQuestionHook(aux);
 	}

kgeography/src/boxasker.cpp

@@ -80,7 +80,7 @@ void boxAsker::nextQuestionHook(const TQString &division)
 	{
 		// false because boxaskers never are clickOnDivision
 		otherDivision = p_map -> getRandomDivision(false);
-		while (auxList.tqfind(otherDivision) != auxList.end()) otherDivision = p_map -> getRandomDivision(false);
+		while (auxList.find(otherDivision) != auxList.end()) otherDivision = p_map -> getRandomDivision(false);
 		if (i == p_position) i++;
 		if (i < 4 && nextBoxAskerQuestionHook(otherDivision, i, false)) i++;
 		auxList << otherDivision;

kgeography/src/map.cpp

@@ -39,8 +39,8 @@ KGmap::~KGmap()
 bool KGmap::addDivision(division *c)
 {
 	bool b;
-	if (p_nameMap.tqfind(c -> getName()) == p_nameMap.end() && 
+	if (p_nameMap.find(c -> getName()) == p_nameMap.end() && 
-		p_colorMap.tqfind(c -> getRGB()) == p_colorMap.end())
+		p_colorMap.find(c -> getRGB()) == p_colorMap.end())
 	{
 		p_colorMap.insert(c -> getRGB(), c);
 		p_nameMap.insert(c -> getName(), c);
@@ -129,7 +129,7 @@ TQString KGmap::getWhatIs(TQRgb c, bool all) const
 {
 	// this is only asked from mapasker.cpp hence the true in canAsk
 	TQMap<TQRgb, division*>::const_iterator it;
-	it = p_colorMap.tqfind(c);
+	it = p_colorMap.find(c);
 	if (it == p_colorMap.end()) return "nothing";
 	else
 	{

kgeography/src/mapparser.cpp

@@ -25,7 +25,7 @@ bool mapReader::parseMap(const TQString &path)
 	TQString aux;
 	p_map = new KGmap();
 	p_map -> setFile(path);
-	aux = path.left(path.tqfindRev('/') + 1); // aux = path but without the file name
+	aux = path.left(path.findRev('/') + 1); // aux = path but without the file name
 	mapParser handler(p_map, aux);
 	TQFile xmlFile(path);
 	if (xmlFile.exists())
@@ -270,10 +270,10 @@ TQString mapParser::errorString()
 
 TQString mapParser::getPreviousTag() const
 {
-	return p_previousTags.right(p_previousTags.length() - p_previousTags.tqfindRev(':') - 1);
+	return p_previousTags.right(p_previousTags.length() - p_previousTags.findRev(':') - 1);
 }
 
 void mapParser::removeLastTag()
 {
-	p_previousTags = p_previousTags.left(p_previousTags.tqfindRev(':'));
+	p_previousTags = p_previousTags.left(p_previousTags.findRev(':'));
 }

khangman/README.languages

@@ -25,7 +25,7 @@ cd kdeedu/khangman
 
      ./add_language <language_code>
 
-   Here you must tqreplace <language_code> with your language code.
+   Here you must replace <language_code> with your language code.
    
 The program will refuse a non-valid language code! 
 

khangman/khangman/khangman.cpp

@@ -90,7 +90,7 @@ void KHangMan::setupActions()
     // Action for selecting language.
     m_languageAction = new KSelectAction(i18n("&Language"), 0, actionCollection(), "languages");
     m_languageAction->setItems(m_languageNames);
-    m_languageAction->setCurrentItem(m_languages.tqfindIndex(Prefs::selectedLanguage()));
+    m_languageAction->setCurrentItem(m_languages.findIndex(Prefs::selectedLanguage()));
     connect(m_languageAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLanguage(int)));
     
     KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
@@ -150,7 +150,7 @@ void KHangMan::slotChangeLevel(int index)
         changeStatusbar("", IDS_ACCENTS);
 #endif
     Prefs::setCurrentLevel(index);
-	levelString.tqreplace(0, 1, levelString.left(1).lower());
+	levelString.replace(0, 1, levelString.left(1).lower());
     Prefs::setLevelFile(levelString +".kvtml");
     Prefs::writeConfig();
     m_view->slotNewGame();
@@ -159,12 +159,12 @@ void KHangMan::slotChangeLevel(int index)
 void KHangMan::slotChangeLanguage(int index)
 {
     //good when no in English
-    kdDebug() << "Change to " << m_languages[m_languageNames.tqfindIndex(m_languageNames[index])] << endl;
+    kdDebug() << "Change to " << m_languages[m_languageNames.findIndex(m_languageNames[index])] << endl;
-    Prefs::setSelectedLanguage(m_languages[m_languageNames.tqfindIndex(m_languageNames[index])]);
+    Prefs::setSelectedLanguage(m_languages[m_languageNames.findIndex(m_languageNames[index])]);
     Prefs::writeConfig();
     loadLevels();
     loadLangToolBar();
-    changeStatusbar(m_languageNames[m_languages.tqfindIndex(Prefs::selectedLanguage())], IDS_LANG);
+    changeStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG);
     setAccent();
     setMessages();
     m_view->slotNewGame();   
@@ -196,8 +196,8 @@ void KHangMan::setLanguages()
     for (TQStringList::Iterator it =mdirs.begin(); it !=mdirs.end(); ++it ) {
         TQDir dir(*it);
         m_languages += dir.entryList(TQDir::Dirs, TQDir::Name);
-        m_languages.remove(m_languages.tqfind("."));
+        m_languages.remove(m_languages.find("."));
-        m_languages.remove(m_languages.tqfind(".."));
+        m_languages.remove(m_languages.find(".."));
     }
     m_languages.sort();
 
@@ -209,7 +209,7 @@ void KHangMan::setLanguages()
 
     TQStringList temp_languages;
     for (uint i=0;  i<m_languages.count(); i++) {
-        if (m_languages.tqcontains(m_languages[i])>1) {
+        if (m_languages.contains(m_languages[i])>1) {
             temp_languages.append(m_languages[i]);
             m_languages.remove(m_languages[i]);
         }
@@ -261,7 +261,7 @@ void KHangMan::loadSettings()
     selectedLanguage = Prefs::selectedLanguage();
     if (m_languages.grep(selectedLanguage).isEmpty())
             selectedLanguage = "en";
-    changeStatusbar(m_languageNames[m_languages.tqfindIndex(Prefs::selectedLanguage())], IDS_LANG);
+    changeStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG);
     // Show/hide characters toolbar
     if (Prefs::showCharToolbar())
         secondToolbar->show();
@@ -276,8 +276,8 @@ void KHangMan::setLevel()
     if (currentLevel > (uint) levels.count()) 
         currentLevel= 0;
     levelString = levels[currentLevel];
-    levelString.tqreplace(0, 1, levelString.left(1).lower());
+    levelString.replace(0, 1, levelString.left(1).lower());
-    levelString = levels[currentLevel].tqreplace(0, 1, levels[currentLevel].left(1).lower()) ;
+    levelString = levels[currentLevel].replace(0, 1, levels[currentLevel].left(1).lower()) ;
 }
 
 void KHangMan::loadLevels()
@@ -292,14 +292,14 @@ void KHangMan::loadLevels()
         for (TQStringList::Iterator it = mfiles.begin(); it != mfiles.end(); ++it ) {
             TQFile f( *it);
             //find the last / in the file name
-            int location = f.name().tqfindRev("/");
+            int location = f.name().findRev("/");
             //strip the string to keep only the filename and not the path
             TQString mString = f.name().right(f.name().length()-location-1);
             if (mString == Prefs::levelFile())
                 levelBool = true;
             mString = mString.left(mString.length()-6);
             //Put the first letter in Upper case
-            mString = mString.tqreplace(0, 1, mString.left(1).upper());
+            mString = mString.replace(0, 1, mString.left(1).upper());
         levels+=mString;
     }
     //TODO else tell no files had been found
@@ -307,13 +307,13 @@ void KHangMan::loadLevels()
 
     // Sort easy, medium, hard at bottom, with the other categories at the top
     levels.sort();
-    TQString tqreplace[3] = { "Easy", "Medium", "Hard" };
+    TQString replace[3] = { "Easy", "Medium", "Hard" };
     for ( int i = 0; i < 3; ++i )
     {
-        if ( levels.tqfindIndex( tqreplace[i] ) > -1 )
+        if ( levels.findIndex( replace[i] ) > -1 )
         {
-            levels.remove( tqreplace[i] );
+            levels.remove( replace[i] );
-            levels.append( tqreplace[i] );
+            levels.append( replace[i] );
         }
     }
 
@@ -338,7 +338,7 @@ void KHangMan::loadLevels()
 
     if (levelBool == false)
     {
-        Prefs::setLevelFile(levels[0].tqreplace(0, 1, levels[0].left(1).lower())+".kvtml");
+        Prefs::setLevelFile(levels[0].replace(0, 1, levels[0].left(1).lower())+".kvtml");
         Prefs::setCurrentLevel(0);
         currentLevel =0;
         Prefs::writeConfig();
@@ -351,7 +351,7 @@ void KHangMan::loadLevels()
     
     setLevel();
     TQString m_lstring = translatedLevels[currentLevel].utf8();
-    m_lstring.tqreplace(0, 1, m_lstring.left(1).upper());
+    m_lstring.replace(0, 1, m_lstring.left(1).upper());
     changeStatusbar(m_lstring, IDS_LEVEL);
 }
 

khangman/khangman/khangmanview.cpp

@@ -102,30 +102,30 @@ void KHangManView::replaceLetters(const TQString& sChar)
     // Replace letter in the word
     if (Prefs::oneLetter()) {
 	// We just replace the next instance.
-        for (int count=0; count < m_word.tqcontains(sChar, false); count++) {
+        for (int count=0; count < m_word.contains(sChar, false); count++) {
 
-            index = m_word.tqfind(sChar, index, false);
+            index = m_word.find(sChar, index, false);
             if (m_goodWord.at(2*index)=='_') {
-		m_goodWord.tqreplace((2*index), 1, m_word.at(index));
+		m_goodWord.replace((2*index), 1, m_word.at(index));
 
                 kdDebug() << "m_goodword " << m_goodWord << endl;
-                if (count == m_word.tqcontains(sChar, false)-1)
+                if (count == m_word.contains(sChar, false)-1)
 		    b_end = true;
                 break;
             }
 	    else
 		index++;
 
-	    if (count == m_word.tqcontains(sChar, false)-1)
+	    if (count == m_word.contains(sChar, false)-1)
 		b_end = true;
         }
     }
     else {
-        for (int count=0; count < m_word.tqcontains(sChar, false); count++) {
+        for (int count=0; count < m_word.contains(sChar, false); count++) {
             //searching for letter location
-            index = m_word.tqfind(sChar, index, false);
+            index = m_word.find(sChar, index, false);
             //we replace it...
-            m_goodWord.tqreplace((2*index), 1,m_word.at(index));
+            m_goodWord.replace((2*index), 1,m_word.at(index));
             index++;
 	}
     }
@@ -146,7 +146,7 @@ void KHangManView::replaceLetters(const TQString& sChar)
     if (!Prefs::oneLetter()) 
         m_guessedLetters << sChar; //appends the list only if not in One Letter only mode...
 
-    if (m_word.tqcontains(sChar, false) == 1) 
+    if (m_word.contains(sChar, false) == 1) 
         m_guessedLetters << sChar; //append if only one instance
 
     if (Prefs::oneLetter() && b_end) 
@@ -159,28 +159,28 @@ bool KHangManView::containsChar(const TQString &sChar)
     bool b = false;
     if (m_accentedLetters && !Prefs::accentedLetters()) {
         if (sChar=="i")
-	    b = m_word.tqcontains(TQString::fromUtf8("í"), false);
+	    b = m_word.contains(TQString::fromUtf8("í"), false);
 
         if (sChar=="a")
-	    b = m_word.tqcontains(TQString::fromUtf8("à"), false)
+	    b = m_word.contains(TQString::fromUtf8("à"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("á"), false)
+		|| m_word.contains(TQString::fromUtf8("á"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("ã"), false);
+		|| m_word.contains(TQString::fromUtf8("ã"), false);
 
         if (sChar=="u")
-	    b = m_word.tqcontains(TQString::fromUtf8("ü"), false)
+	    b = m_word.contains(TQString::fromUtf8("ü"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("ù"), false);
+		|| m_word.contains(TQString::fromUtf8("ù"), false);
 
         if (sChar=="o")
-	    b = m_word.tqcontains(TQString::fromUtf8("ò"), false)
+	    b = m_word.contains(TQString::fromUtf8("ò"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("ó"), false)
+		|| m_word.contains(TQString::fromUtf8("ó"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("õ"), false);
+		|| m_word.contains(TQString::fromUtf8("õ"), false);
 
         if (sChar=="e")
-	    b = m_word.tqcontains(TQString::fromUtf8("è"), false)
+	    b = m_word.contains(TQString::fromUtf8("è"), false)
-		|| m_word.tqcontains(TQString::fromUtf8("é"), false);
+		|| m_word.contains(TQString::fromUtf8("é"), false);
     }
 
-    return (b || m_word.tqcontains(sChar, false));
+    return (b || m_word.contains(sChar, false));
 }
 
 
@@ -379,7 +379,7 @@ void KHangManView::slotTry()
     }
 
     // Handle the guess.
-    if (!m_guessedLetters.tqcontains(guess.lower())) {
+    if (!m_guessedLetters.contains(guess.lower())) {
 	// The letter is not already guessed.
 	
 	if (containsChar(guess)) {
@@ -389,11 +389,11 @@ void KHangManView::slotTry()
 	    TQString  stripWord = m_goodWord;
 	    TQString  sword     = m_word;
 	    if (dd > 0)  {
-		stripWord.tqreplace(2*c,   1, "");
+		stripWord.replace(2*c,   1, "");
-		stripWord.tqreplace(2*c-1, 1, "");
+		stripWord.replace(2*c-1, 1, "");
 
-		stripWord.tqreplace(2*(dd-1),   1, "");
+		stripWord.replace(2*(dd-1),   1, "");
-		stripWord.tqreplace(2*(dd-1)-1, 1, "");
+		stripWord.replace(2*(dd-1)-1, 1, "");
 	    }
 
 	    TQStringList  rightChars = TQStringList::split(" ", stripWord, true);
@@ -442,7 +442,7 @@ void KHangManView::slotTry()
 
 	    m_guessedLetters << guess.lower();	
             m_guessedLetters << guess.upper();
-	    m_missedLetters = m_missedLetters.tqreplace((2 * m_numMissedLetters), 
+	    m_missedLetters = m_missedLetters.replace((2 * m_numMissedLetters), 
 						      1, guess.lower());
 	    m_numMissedLetters++;
 	    update();
@@ -496,7 +496,7 @@ void KHangManView::slotTry()
 
 	int  x = 0;
 	int  y = 0;
-	if (m_missedLetters.tqcontains(guess, false) > 0) {
+	if (m_missedLetters.contains(guess, false) > 0) {
 	    // FIXME: popup should be better placed.
 
 	    TQPoint abspos = popup->pos();
@@ -513,7 +513,7 @@ void KHangManView::slotTry()
 	    m_letterInput->setEnabled(false);
 	}
 
-	if (m_goodWord.tqcontains(guess, false) > 0) {
+	if (m_goodWord.contains(guess, false) > 0) {
 	    TQPoint abspos = popup->pos();
 
 	    if (Prefs::mode() == 0) {
@@ -631,35 +631,35 @@ void KHangManView::game()
     // If needed, display white space or - if in word or semi dot.
 
     // 1. Find dashes.
-    int f = m_word.tqfind( "-" );
+    int f = m_word.find( "-" );
     if (f>0) {
-        m_goodWord.tqreplace(2*f, 1, "-");
+        m_goodWord.replace(2*f, 1, "-");
 
-        int g = m_word.tqfind( "-", f+1);
+        int g = m_word.find( "-", f+1);
         if (g>0) 
-	    m_goodWord.tqreplace(2*g, 3, "-");
+	    m_goodWord.replace(2*g, 3, "-");
         if (g>1)
 	    m_goodWord.append("_");
     }
 
     // 2. Find white space.
-    c = m_word.tqfind( " " );
+    c = m_word.find( " " );
     if (c > 0) {
-        m_goodWord.tqreplace(2*c, 1, " ");
+        m_goodWord.replace(2*c, 1, " ");
-        dd = m_word.tqfind( " ", c+1);
+        dd = m_word.find( " ", c+1);
         if (dd > 0)
-	    m_goodWord.tqreplace(2*dd, c+1, " ");
+	    m_goodWord.replace(2*dd, c+1, " ");
     }
 
     // 3. Find ·
-    int e = m_word.tqfind( TQString::fromUtf8("·") );
+    int e = m_word.find( TQString::fromUtf8("·") );
     if (e>0)
-	m_goodWord.tqreplace(2*e, 1, TQString::fromUtf8("·") );
+	m_goodWord.replace(2*e, 1, TQString::fromUtf8("·") );
 
     // 4. Find '
-    int h = m_word.tqfind( "'" );
+    int h = m_word.find( "'" );
     if (h>0)
-	m_goodWord.tqreplace(2*h, 1, "'");
+	m_goodWord.replace(2*h, 1, "'");
 }
 
 

khangman/khangman/khnewstuff.cpp

@@ -55,8 +55,8 @@ bool KHNewStuff::install( const TQString &fileName )
     m_view->khangman->setLanguages();
     //refresh Languages menu
     m_view->khangman->m_languageAction->setItems(m_view->khangman->m_languageNames);
-    m_view->khangman->slotChangeLanguage(m_view->khangman->m_languages.tqfindIndex(Prefs::selectedLanguage()));
+    m_view->khangman->slotChangeLanguage(m_view->khangman->m_languages.findIndex(Prefs::selectedLanguage()));
-    m_view->khangman->m_languageAction->setCurrentItem(m_view->khangman->m_languages.tqfindIndex(Prefs::selectedLanguage()));
+    m_view->khangman->m_languageAction->setCurrentItem(m_view->khangman->m_languages.findIndex(Prefs::selectedLanguage()));
     return true;
 }
 

kig/DESIGN

@@ -158,7 +158,7 @@ Most of this is handled by the TextType class.
 
 2.1.2 TextType
 
-The TextType class is an implementation of an ObjectType.  It tqcontains
+The TextType class is an implementation of an ObjectType.  It contains
 code specifying how to calculate a TextImp from its parents, and for
 how it behaves on user input.  A text object has at least three
 parents, and can handle any number of optional arguments.  The three

kig/FEATURES

@@ -16,7 +16,7 @@ here are some nice Kig features i'd like to show off :)
 - is a KPart: try opening macrotest.kig from konqueror, if it doesn't 
   work yet, open your kcontrol, then go to "File Browsing"->"File
   Associations", click add, group:"application", name:"x-kig", open
-  the "embedding" tab page for the new type, click "add", tqfind
+  the "embedding" tab page for the new type, click "add", find
   "KigPart" (if you installed Kig correctly (did you get the
   "--prefix" on your configure right?) , it should be there), and add
   it. then try opening macrotest.kig again
@@ -30,7 +30,7 @@ here are some nice Kig features i'd like to show off :)
   Moreover, the other supported formats are: XFig files, and SVG and
   LaTeX documents. These are useful since not all other programs
   support Kig files yet... ;)
-- Kig is very compatible with the program it was intended to tqreplace,
+- Kig is very compatible with the program it was intended to replace,
   KGeo.  It supports all of its Object types and most of its file
   format... 
 - There is a very flexible mechanism for supporting TextLabels with

kig/README.boost-python1.30-gcc3.2

@@ -12,7 +12,7 @@ be applied in the following way.
 Open a console window, and go to the directory containing the
 Boost.Python headers.  This will most likely be called something like
 "/usr/include/boost/python/".  Then execute the following commands (
-before giving these commands, tqreplace "/dir/to/kig/distribution/" by
+before giving these commands, replace "/dir/to/kig/distribution/" by
 the directory where you put the downloaded kig distribution ):
 
 cd object

kig/examples/session_alotofthings.fgeo

@@ -63,7 +63,7 @@
       <tqparent ref="82BF640"/>
     </point>
   </drgeo>
-  <text name="Testo 1">Figure 1 tqcontains:
+  <text name="Testo 1">Figure 1 contains:
 - some points;
 - an arc;
 - a line;
@@ -72,14 +72,14 @@
 - an intersection point;
 - a reflection point;
 
-Figure 2 tqcontains:
+Figure 2 contains:
 - some points;
 - 2 lines;
 - a midpoint;
 - a parallel;
 - 2 intersection points;
 
-Figure 3 tqcontains:
+Figure 3 contains:
 - some points;
 - a circle;
 - a vector;

kig/filters/exporter.cc

@@ -297,7 +297,7 @@ void XFigExportImpVisitor::mapColor( const ObjectDrawer* obj )
 void XFigExportImpVisitor::visit( ObjectHolder* obj )
 {
   if ( ! obj->drawer()->shown() ) return;
-  assert( mcolormap.tqfind( obj->drawer()->color() ) != mcolormap.end() );
+  assert( mcolormap.find( obj->drawer()->color() ) != mcolormap.end() );
   mcurcolorid = mcolormap[ obj->drawer()->color() ];
   mcurobj = obj;
   obj->imp()->visit( this );

kig/filters/filter.cc

@@ -31,7 +31,7 @@
 
 KigFilters* KigFilters::sThis;
 
-KigFilter* KigFilters::tqfind(const TQString& mime)
+KigFilter* KigFilters::find(const TQString& mime)
 {
   for (vect::iterator i = mFilters.begin(); i != mFilters.end(); ++i)
     {

kig/filters/filter.h

@@ -34,7 +34,7 @@ class KigFilters
 {
 public:
   static KigFilters* instance();
-  KigFilter* tqfind (const TQString& mime);
+  KigFilter* find (const TQString& mime);
 
 //  bool save ( const KigDocument& data, TQTextStream& stream );
   /**

kig/filters/kseg-filter.cc

@@ -362,7 +362,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
           if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
           if ( !parents[0]->imp()->inherits( SegmentImp::stype() ) )
             KIG_FILTER_PARSE_ERROR;
-          int index = parents[0]->imp()->propertiesInternalNames().tqfindIndex( "mid-point" );
+          int index = parents[0]->imp()->propertiesInternalNames().findIndex( "mid-point" );
           assert( index != -1 );
           o = new ObjectPropertyCalcer( parents[0], index );
           break;
@@ -494,7 +494,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
             point = parents[1];
             segment = parents[0];
           };
-          int index = segment->imp()->propertiesInternalNames().tqfindIndex( "length" );
+          int index = segment->imp()->propertiesInternalNames().findIndex( "length" );
           if ( index == -1 ) KIG_FILTER_PARSE_ERROR;
           ObjectPropertyCalcer* length = new ObjectPropertyCalcer( segment, index );
           length->calc( *retdoc );

kig/filters/latexexporter.cc

@@ -194,7 +194,7 @@ void LatexExportImpVisitor::mapColor( TQColor color )
     ColorMap newcolor;
     newcolor.color = color;
     TQString tmpname = color.name();
-    tmpname.tqreplace( "#", "" );
+    tmpname.replace( "#", "" );
     newcolor.name = tmpname;
     mcolors.push_back( newcolor );
     mstream << "\\newrgbcolor{" << tmpname << "}{" 

kig/filters/native-filter.cc

@@ -318,7 +318,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement&
           if ( i->parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
           ObjectCalcer* tqparent = retcalcers[i->parents[0] -1];
           QCStringList propnames = tqparent->imp()->propertiesInternalNames();
-          int propid = propnames.tqfindIndex( propname );
+          int propid = propnames.findIndex( propname );
           if ( propid == -1 )
             KIG_FILTER_PARSE_ERROR;
 
@@ -331,7 +331,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement&
             KIG_FILTER_PARSE_ERROR;
 
           const ObjectType* type =
-            ObjectTypeFactory::instance()->tqfind( tmp.latin1() );
+            ObjectTypeFactory::instance()->find( tmp.latin1() );
           if ( !type )
           {
             notSupported( file, i18n( "This Kig file uses an object of type \"%1\", "
@@ -469,7 +469,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
           TQCString propname = e.attribute( "which" ).latin1();
 
           ObjectCalcer* tqparent = parents[0];
-          int propid = tqparent->imp()->propertiesInternalNames().tqfindIndex( propname );
+          int propid = tqparent->imp()->propertiesInternalNames().findIndex( propname );
           if ( propid == -1 ) KIG_FILTER_PARSE_ERROR;
 
           o = new ObjectPropertyCalcer( tqparent, propid );
@@ -478,7 +478,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
         {
           TQString tmp = e.attribute( "type" );
           const ObjectType* type =
-            ObjectTypeFactory::instance()->tqfind( tmp.latin1() );
+            ObjectTypeFactory::instance()->find( tmp.latin1() );
           if ( ! type )
           {
             notSupported( file, i18n( "This Kig file uses an object of type \"%1\", "

kig/kfile/kfile_drgeo.cpp

@@ -41,7 +41,7 @@ DrgeoPlugin::DrgeoPlugin( TQObject *tqparent, const char *name, const TQStringLi
   item = addItemInfo( group, "NumOfMacros", i18n( "Macros" ), TQVariant::Int );
   
   group_contents = addGroupInfo( info, "DrgeoContents", i18n( "Translators: what this drgeo "
-                                                              "file tqcontains", "Contents" ) );
+                                                              "file contains", "Contents" ) );
 }
 
 bool DrgeoPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )

kig/kig/kig_document.cc

@@ -69,7 +69,7 @@ std::vector<ObjectHolder*> KigDocument::whatAmIOn( const Coordinate& p, const Ki
   for ( std::set<ObjectHolder*>::const_iterator i = mobjects.begin();
         i != mobjects.end(); ++i )
   {
-    if(!(*i)->tqcontains(p, w, mnightvision)) continue;
+    if(!(*i)->contains(p, w, mnightvision)) continue;
     if ( (*i)->imp()->inherits( PointImp::stype() ) ) ret.push_back( *i );
     else 
       if ( !(*i)->imp()->inherits( PolygonImp::stype() ) ) curves.push_back( *i );

kig/kig/kig_part.cpp

@@ -378,7 +378,7 @@ bool KigPart::openFile()
   // findByURL...
   KMimeType::Ptr mimeType = KMimeType::findByPath ( m_file );
   kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl;
-  KigFilter* filter = KigFilters::instance()->tqfind( mimeType->name() );
+  KigFilter* filter = KigFilters::instance()->find( mimeType->name() );
   if ( !filter )
   {
     // we don't support this mime type...
@@ -922,7 +922,7 @@ extern "C" int convertToNative( const KURL& url, const TQCString& outfile )
 
   KMimeType::Ptr mimeType = KMimeType::findByPath ( file );
   kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl;
-  KigFilter* filter = KigFilters::instance()->tqfind( mimeType->name() );
+  KigFilter* filter = KigFilters::instance()->find( mimeType->name() );
   if ( !filter )
   {
     kdError() << "The file \"" << file << "\" is of a filetype not currently supported by Kig." << endl;

kig/kig/kig_view.cpp

@@ -336,7 +336,7 @@ void KigView::updateScrollBars()
   Rect er = mrealwidget->entireDocumentRect();
   Rect sr = mrealwidget->screenInfo().shownRect();
 
-  // we define the total rect to be the smallest rect that tqcontains
+  // we define the total rect to be the smallest rect that contains
   // both er and sr...
   er |= sr;
 

kig/misc/builtin_stuff.cc

@@ -509,7 +509,7 @@ void setupBuiltinStuff()
       ContainsTestType::instance(),
       I18N_NOOP( "Contains Test" ),
       I18N_NOOP( "Test whether a given curve contains a given point" ),
-      "testtqcontains" );
+      "testcontains" );
     ctors->add( c );
     actions->add( new ConstructibleAction( c, "objects_new_containstest" ) );
 

kig/misc/calcpaths.cc

@@ -33,7 +33,7 @@
 // I previously misunderstood the semantics of this function
 // and thought that the os vector had to be completed with all
 // the subtree generated by it.  On the contrary, the os vector
-// tqcontains *all* the objects that we want, we only have to
+// contains *all* the objects that we want, we only have to
 // reorder them.  Now it *should* work, however we postpone 
 // activating this to a more proper moment
 

kig/misc/common.cpp

@@ -422,7 +422,7 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b,
 //  if ( fabs( a.x - b.x ) <= 1e-7 )
 //  {
 //    // too small to be useful..
-//    return r.tqcontains( Coordinate( a.x, r.center().y ), miss );
+//    return r.contains( Coordinate( a.x, r.center().y ), miss );
 //  }
 
 // in case we have a segment we need also to check for the case when
@@ -433,7 +433,7 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b,
 // - if the midpoint is in the rect than returning true is safe (also
 //   in the cases where we have a ray or a line)
 
-  if ( r.tqcontains( 0.5*( a + b ), miss ) ) return true;
+  if ( r.contains( 0.5*( a + b ), miss ) ) return true;
 
   Coordinate dir = b - a;
   double m = dir.y / dir.x;
@@ -455,10 +455,10 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b,
   // intersection is not between the begin and end point.. ) and if
   // the rect contains the intersection..  If it does, we have a winner..
   return
-    ( imp->tqcontains( leftint, width, w ) && r.tqcontains( leftint, miss ) ) ||
+    ( imp->contains( leftint, width, w ) && r.contains( leftint, miss ) ) ||
-    ( imp->tqcontains( rightint, width, w ) && r.tqcontains( rightint, miss ) ) ||
+    ( imp->contains( rightint, width, w ) && r.contains( rightint, miss ) ) ||
-    ( imp->tqcontains( bottomint, width, w ) && r.tqcontains( bottomint, miss ) ) ||
+    ( imp->contains( bottomint, width, w ) && r.contains( bottomint, miss ) ) ||
-    ( imp->tqcontains( topint, width, w ) && r.tqcontains( topint, miss ) );
+    ( imp->contains( topint, width, w ) && r.contains( topint, miss ) );
 }
 
 bool operator==( const LineData& l, const LineData& r )

kig/misc/coordinate_system.cpp

@@ -80,7 +80,7 @@ TQValidator::State CoordinateValidator::validate( TQString & input, int & pos )
   if( tinput[tinput.length() - 1 ] == ' ' ) tinput.truncate( tinput.length() - 1 );
   if ( tinput[0] == '(' ) tinput = tinput.mid( 1 );
   if( tinput[0] == ' ' ) tinput = tinput.mid( 1 );
-  int scp = tinput.tqfind( ';' );
+  int scp = tinput.find( ';' );
   if ( scp == -1 ) return mdv.validate( tinput, pos ) == Invalid ? Invalid : Valid;
   else
   {
@@ -101,16 +101,16 @@ TQValidator::State CoordinateValidator::validate( TQString & input, int & pos )
 
 void CoordinateValidator::fixup( TQString & input ) const
 {
-  int nsc = input.tqcontains( ';' );
+  int nsc = input.contains( ';' );
   if ( nsc > 1 )
   {
     // where is the second ';'
-    int i = input.tqfind( ';' );
+    int i = input.find( ';' );
-    i = input.tqfind( ';', i );
+    i = input.find( ';', i );
     input = input.left( i );
   };
   // now the string has at most one semicolon left..
-  int sc = input.tqfind( ';' );
+  int sc = input.find( ';' );
   if ( sc == -1 )
   {
     sc = input.length();
@@ -616,7 +616,7 @@ Coordinate EuclideanCoords::snapToGrid( const Coordinate& c,
 Coordinate PolarCoords::snapToGrid( const Coordinate& c,
                                     const KigWidget& w ) const
 {
-  // we reuse the drawGrid code to tqfind
+  // we reuse the drawGrid code to find
 
   // we multiply by sqrt( 2 ) cause we don't want to miss circles in
   // the corners, that intersect with the axes outside of the

kig/misc/guiaction.cc

@@ -93,7 +93,7 @@ KigGUIAction::KigGUIAction( GUIAction* act,
 {
   setWhatsThis( act->description() );
   TQString tooltip = act->descriptiveName();
-  tooltip.tqreplace( TQRegExp( "&&" ), "&" );
+  tooltip.replace( TQRegExp( "&&" ), "&" );
   setToolTip( tooltip );
 }
 

kig/misc/kigpainter.cpp

@@ -835,7 +835,7 @@ void KigPainter::drawCurve( const CurveImp* curve )
       bool dooverlay = ! overlaypt && h < hmaxoverlay && valid0 && valid1
                        && fabs( p0.x - p1.x ) <= overlayRectSize()
                        && fabs( p0.y - p1.y ) <= overlayRectSize();
-      bool addn = sr.tqcontains( p2 ) || h >= hmax;
+      bool addn = sr.contains( p2 ) || h >= hmax;
       // estimated error between the curve and the segments
       double errsq = 1e21;
       if ( allvalid ) errsq = (0.5*p0 + 0.5*p1 - p2).squareLength();
@@ -870,10 +870,10 @@ void KigPainter::drawCurve( const CurveImp* curve )
       else if ( h >= hmin )   // we do not continue to subdivide indefinitely!
       {
         // push into stack in order to process both subintervals
-        if ( addn || ( valid0 && sr.tqcontains( p0 ) ) )
+        if ( addn || ( valid0 && sr.contains( p0 ) ) )
           workstack.push( workitem( curitem.first, coordparampair( t2, p2 ),
                                     overlaypt ) );
-        if ( addn || ( valid1 && sr.tqcontains( p1 ) ) )
+        if ( addn || ( valid1 && sr.contains( p1 ) ) )
         {
           curitem = workitem( coordparampair( t2, p2 ), curitem.second ,
                               overlaypt );

kig/misc/object_constructor.cc

@@ -554,7 +554,7 @@ void PropertyObjectConstructor::drawprelim(
   const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents,
   const KigDocument& d ) const
 {
-  int index = parents[0]->imp()->propertiesInternalNames().tqfindIndex( mpropinternalname );
+  int index = parents[0]->imp()->propertiesInternalNames().findIndex( mpropinternalname );
   assert ( index != -1 );
   ObjectImp* imp = parents[0]->imp()->property( index, d );
   drawer.draw( *imp, p, true );
@@ -565,7 +565,7 @@ std::vector<ObjectHolder*> PropertyObjectConstructor::build(
   const std::vector<ObjectCalcer*>& parents, KigDocument&,
   KigWidget& ) const
 {
-  int index = parents[0]->imp()->propertiesInternalNames().tqfindIndex( mpropinternalname );
+  int index = parents[0]->imp()->propertiesInternalNames().findIndex( mpropinternalname );
   assert( index != -1 );
   std::vector<ObjectHolder*> ret;
   ret.push_back(

kig/misc/object_hierarchy.cc

@@ -51,7 +51,7 @@ public:
   // value to true.
   virtual void checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const = 0;
   // this function is used to check whether the given objects are all
-  // used by one or more of the final objects.  The usedstack tqcontains
+  // used by one or more of the final objects.  The usedstack contains
   // a set of booleans telling which parts of the hierarchy are
   // certainly ancestors of the final objects.  In this function, the
   // node should set all of its parents' booleans to true.
@@ -237,7 +237,7 @@ void FetchPropertyNode::apply( std::vector<const ObjectImp*>& stack,
                                int loc, const KigDocument& d ) const
 {
   assert( stack[mtqparent] );
-  if ( mpropid == -1 ) mpropid = stack[mtqparent]->propertiesInternalNames().tqfindIndex( mname );
+  if ( mpropid == -1 ) mpropid = stack[mtqparent]->propertiesInternalNames().findIndex( mname );
   if ( mpropid != -1 )
     stack[loc] = stack[mtqparent]->property( mpropid, d );
   else
@@ -247,7 +247,7 @@ void FetchPropertyNode::apply( std::vector<const ObjectImp*>& stack,
 void FetchPropertyNode::apply( std::vector<ObjectCalcer*>& stack, int loc ) const
 {
   if ( mpropid == -1 )
-    mpropid = stack[mtqparent]->imp()->propertiesInternalNames().tqfindIndex( mname );
+    mpropid = stack[mtqparent]->imp()->propertiesInternalNames().findIndex( mname );
   assert( mpropid != -1 );
   stack[loc] = new ObjectPropertyCalcer( stack[mtqparent], mpropid );
 }
@@ -537,7 +537,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement&
     {
       // ApplyTypeNode
       TQCString typen = e.attribute( "type" ).latin1();
-      const ObjectType* type = ObjectTypeFactory::instance()->tqfind( typen );
+      const ObjectType* type = ObjectTypeFactory::instance()->find( typen );
       if ( ! type )
       {
         error = i18n( "This Kig file uses an object of type \"%1\", "
@@ -696,7 +696,7 @@ const ObjectImpType* lowermost( const ObjectImpType* a, const ObjectImpType* b )
 // this function is part of the visit procedure really.  It is
 // factored out, because it recurses for cache ObjectImp's.  What this
 // does is, it makes sure that object o is calcable, by putting
-// appropriate Node's in mnodes..  po is o->parents() and pl tqcontains
+// appropriate Node's in mnodes..  po is o->parents() and pl contains
 // the location of objects that are already in mnodes and -1
 // otherwise..  -1 means we have to store their ObjectImp, unless
 // they're cache ObjectImp's etc.

kig/misc/rect.cc

@@ -211,7 +211,7 @@ double Rect::height() const
   return mheight;
 }
 
-bool Rect::tqcontains( const Coordinate& p, double allowed_miss ) const
+bool Rect::contains( const Coordinate& p, double allowed_miss ) const
 {
   return p.x - left() >= - allowed_miss &&
     p.y - bottom() >= - allowed_miss &&
@@ -219,7 +219,7 @@ bool Rect::tqcontains( const Coordinate& p, double allowed_miss ) const
     p.y - bottom() - height() <= allowed_miss;
 }
 
-bool Rect::tqcontains( const Coordinate& p ) const
+bool Rect::contains( const Coordinate& p ) const
 {
   return p.x >= left() &&
     p.y >= bottom() &&

kig/misc/rect.h

@@ -115,8 +115,8 @@ public:
   double top() const;
   double width() const;
   double height() const;
-  bool tqcontains( const Coordinate& p ) const;
+  bool contains( const Coordinate& p ) const;
-  bool tqcontains( const Coordinate& p, double allowed_miss ) const;
+  bool contains( const Coordinate& p, double allowed_miss ) const;
   bool intersects( const Rect& p ) const;
   Rect normalized() const;
   friend kdbgstream& operator<<( kdbgstream& s, const Rect& t );

kig/misc/special_constructors.cc

@@ -1403,7 +1403,7 @@ std::vector<ObjectHolder*> MidPointOfTwoPointsConstructor::build(
 {
   ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), os );
   seg->calc( d );
-  int index = seg->imp()->propertiesInternalNames().tqfindIndex( "mid-point" );
+  int index = seg->imp()->propertiesInternalNames().findIndex( "mid-point" );
   assert( index != -1 );
   ObjectPropertyCalcer* prop = new ObjectPropertyCalcer( seg, index );
   prop->calc( d );

kig/modes/construct_mode.cc

@@ -489,7 +489,7 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p,
     assert( mresult->imp()->inherits( TestResultImp::stype() ) );
     parents.push_back(
       new ObjectPropertyCalcer(
-        mresult.get(), mresult->imp()->propertiesInternalNames().tqfindIndex( "test-result" ) ) );
+        mresult.get(), mresult->imp()->propertiesInternalNames().findIndex( "test-result" ) ) );
     parents.back()->calc( mdoc.document() );
 
     ObjectCalcer* ret = new ObjectTypeCalcer( TextType::instance(), parents );

kig/modes/moving.cc

@@ -164,7 +164,7 @@ void MovingMode::moveTo( const Coordinate& o, bool snaptogrid )
 {
   for( std::vector<ObjectCalcer*>::iterator i = d->emo.begin(); i != d->emo.end(); ++i )
   {
-    assert( d->refmap.tqfind( *i ) != d->refmap.end() );
+    assert( d->refmap.find( *i ) != d->refmap.end() );
     Coordinate nc = d->refmap[*i] + ( o - d->pwwsm );
     if ( snaptogrid ) nc = mdoc.document().coordinateSystem().snapToGrid( nc, mview );
     (*i)->move( nc, mdoc.document() );

kig/objects/bogus_imp.cc

@@ -32,7 +32,7 @@ void BogusImp::draw( KigPainter& ) const
 {
 }
 
-bool BogusImp::tqcontains( const Coordinate&, int, const KigWidget& ) const
+bool BogusImp::contains( const Coordinate&, int, const KigWidget& ) const
 {
   return false;
 }

kig/objects/bogus_imp.h

@@ -46,7 +46,7 @@ public:
 
   Coordinate attachPoint( ) const;
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& w ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& w ) const;
   bool inRect( const Rect& r, int width, const KigWidget& w ) const;
   Rect surroundingRect() const;
 

kig/objects/circle_imp.cc

@@ -63,7 +63,7 @@ void CircleImp::draw( KigPainter& p ) const
   p.drawCircle( mcenter, mradius );
 }
 
-bool CircleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
+bool CircleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
 {
   return fabs((mcenter - p).length() - mradius) <= w.screenInfo().normalMiss( width );
 }
@@ -72,10 +72,10 @@ bool CircleImp::inRect( const Rect& r, int width, const KigWidget& w ) const
 {
   // first we check if the rect contains at least one of the
   // north/south/east/west points of the circle
-  if ( r.tqcontains( mcenter + Coordinate( 0, -mradius ) ) ) return true;
+  if ( r.contains( mcenter + Coordinate( 0, -mradius ) ) ) return true;
-  if ( r.tqcontains( mcenter + Coordinate( mradius, 0 ) ) ) return true;
+  if ( r.contains( mcenter + Coordinate( mradius, 0 ) ) ) return true;
-  if ( r.tqcontains( mcenter + Coordinate( 0, mradius ) ) ) return true;
+  if ( r.contains( mcenter + Coordinate( 0, mradius ) ) ) return true;
-  if ( r.tqcontains( mcenter + Coordinate( -mradius, 0 ) ) ) return true;
+  if ( r.contains( mcenter + Coordinate( -mradius, 0 ) ) ) return true;
 
   // we allow a miss of some pixels ..
   double miss = w.screenInfo().normalMiss( width );

kig/objects/circle_imp.h

@@ -46,7 +46,7 @@ public:
   ObjectImp* transform( const Transformation& ) const;
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& ) const;
   bool inRect( const Rect& r, int width, const KigWidget& ) const;
   bool valid() const;
   Rect surroundingRect() const;

kig/objects/conic_imp.cc

@@ -47,7 +47,7 @@ bool ConicImp::valid() const
   return true;
 }
 
-bool ConicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const
+bool ConicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const
 {
   return internalContainsPoint( o, w.screenInfo().normalMiss( width ) );
 }

kig/objects/conic_imp.h

@@ -51,7 +51,7 @@ public:
   ObjectImp* transform( const Transformation& ) const;
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& ) const;
   bool inRect( const Rect& r, int width, const KigWidget& ) const;
   bool valid() const;
   Rect surroundingRect() const;

kig/objects/cubic_imp.cc

@@ -50,7 +50,7 @@ void CubicImp::draw( KigPainter& p ) const
   p.drawCurve( this );
 }
 
-bool CubicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const
+bool CubicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const
 {
   return internalContainsPoint( o, w.screenInfo().normalMiss( width ) );
 }
@@ -431,7 +431,7 @@ TQString CubicImp::cartesianEquationString( const KigDocument& ) const
   ret = ret.tqarg( mdata.coeffs[0], 0, 'g', 3 );
 
   // we should find a common place to do this...
-  ret.tqreplace( "+ -", "- " );
+  ret.replace( "+ -", "- " );
-  ret.tqreplace( "+-", "-" );
+  ret.replace( "+-", "-" );
   return ret;
 }

kig/objects/cubic_imp.h

@@ -40,7 +40,7 @@ public:
 
   ObjectImp* transform( const Transformation& ) const;
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& ) const;
   bool inRect( const Rect& r, int width, const KigWidget& ) const;
   Rect surroundingRect() const;
   TQString cartesianEquationString( const KigDocument& ) const;

kig/objects/line_imp.cc

@@ -197,7 +197,7 @@ void SegmentImp::draw( KigPainter& p ) const
   p.drawSegment( mdata );
 }
 
-bool SegmentImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
+bool SegmentImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
 {
   return internalContainsPoint( p, w.screenInfo().normalMiss( width ) );
 }
@@ -207,7 +207,7 @@ void RayImp::draw( KigPainter& p ) const
   p.drawRay( mdata );
 }
 
-bool RayImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
+bool RayImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
 {
   return internalContainsPoint( p, w.screenInfo().normalMiss( width ) );
 }
@@ -217,7 +217,7 @@ void LineImp::draw( KigPainter& p ) const
   p.drawLine( mdata );
 }
 
-bool LineImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
+bool LineImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
 {
   return internalContainsPoint( p, w.screenInfo().normalMiss( width ) );
 }

kig/objects/line_imp.h

@@ -99,7 +99,7 @@ public:
   SegmentImp( const LineData& d );
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& si ) const;
   Rect surroundingRect() const;
 
   ObjectImp* transform( const Transformation& ) const;
@@ -154,7 +154,7 @@ public:
   RayImp( const LineData& d );
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& si ) const;
   Rect surroundingRect() const;
 
   ObjectImp* transform( const Transformation& ) const;
@@ -195,7 +195,7 @@ public:
    */
   LineImp( const LineData& d );
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& si ) const;
   Rect surroundingRect() const;
 
   ObjectImp* transform( const Transformation& ) const;

kig/objects/locus_imp.cc

@@ -49,7 +49,7 @@ void LocusImp::draw( KigPainter& p ) const
   p.drawCurve( this );
 }
 
-bool LocusImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
+bool LocusImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
 {
   return internalContainsPoint( p, w.screenInfo().normalMiss( width ), w.document() );
 }

kig/objects/locus_imp.h

@@ -66,7 +66,7 @@ public:
   ObjectImp* transform( const Transformation& ) const;
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& ) const;
   Rect surroundingRect() const;
   bool inRect( const Rect& r, int width, const KigWidget& ) const;
   double getParam( const Coordinate& point, const KigDocument& ) const;

kig/objects/object_calcer.cc

@@ -202,7 +202,7 @@ const ObjectImpType* ObjectTypeCalcer::impRequirement(
     os.begin(), os.end(),
     std::back_inserter( args ),
     std::mem_fun( &ObjectCalcer::imp ) );
-  assert( std::tqfind( args.begin(), args.end(), o->imp() ) != args.end() );
+  assert( std::find( args.begin(), args.end(), o->imp() ) != args.end() );
   return mtype->impRequirement( o->imp(), args );
 }
 

kig/objects/object_drawer.cc

@@ -41,10 +41,10 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const
   }
 }
 
-bool ObjectDrawer::tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const
+bool ObjectDrawer::contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const
 {
   bool shownornv = mshown || nv;
-  return shownornv && imp.tqcontains( pt, mwidth, w );
+  return shownornv && imp.contains( pt, mwidth, w );
 }
 
 bool ObjectDrawer::shown( ) const

kig/objects/object_drawer.h

@@ -68,7 +68,7 @@ public:
    * dependent on whether it is shown ( when it will never contain
    * anything ), and on its width..
    */
-  bool tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv = false ) const;
+  bool contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv = false ) const;
   /**
    * returns whether the object \p imp is in the rectangle \p r . This is
    * dependent on whether it is shown and on its width..

kig/objects/object_factory.cc

@@ -277,7 +277,7 @@ ObjectHolder* ObjectFactory::attachedLabel(
 ObjectPropertyCalcer* ObjectFactory::propertyObjectCalcer(
   ObjectCalcer* o, const char* p ) const
 {
-  int wp = o->imp()->propertiesInternalNames().tqfindIndex( p );
+  int wp = o->imp()->propertiesInternalNames().findIndex( p );
   if ( wp == -1 ) return 0;
   return new ObjectPropertyCalcer( o, wp );
 }

kig/objects/object_holder.cc

@@ -80,9 +80,9 @@ void ObjectHolder::draw( KigPainter& p, bool selected ) const
   mdrawer->draw( *imp(), p, selected );
 }
 
-bool ObjectHolder::tqcontains( const Coordinate& pt, const KigWidget& w, bool nv ) const
+bool ObjectHolder::contains( const Coordinate& pt, const KigWidget& w, bool nv ) const
 {
-  return mdrawer->tqcontains( *imp(), pt, w, nv );
+  return mdrawer->contains( *imp(), pt, w, nv );
 }
 
 bool ObjectHolder::inRect( const Rect& r, const KigWidget& w ) const

kig/objects/object_holder.h

@@ -103,7 +103,7 @@ public:
   /**
    * Returns whether this object contains the point \p p .
    */
-  bool tqcontains( const Coordinate& p, const KigWidget& w, bool nv = false ) const;
+  bool contains( const Coordinate& p, const KigWidget& w, bool nv = false ) const;
   /**
    * Returns whether this object is in the rectangle \p r .
    */

kig/objects/object_imp.h

@@ -268,7 +268,7 @@ public:
   virtual ObjectImp* transform( const Transformation& t ) const = 0;
 
   virtual void draw( KigPainter& p ) const = 0;
-  virtual bool tqcontains( const Coordinate& p, int width,
+  virtual bool contains( const Coordinate& p, int width,
                          const KigWidget& si ) const = 0;
   virtual bool inRect( const Rect& r, int width,
                        const KigWidget& si ) const = 0;

kig/objects/object_type_factory.cc

@@ -56,11 +56,11 @@ ObjectTypeFactory* ObjectTypeFactory::instance()
 
 void ObjectTypeFactory::add( const ObjectType* type )
 {
-  assert( mmap.tqfind( std::string( type->fullName() ) ) == mmap.end() );
+  assert( mmap.find( std::string( type->fullName() ) ) == mmap.end() );
   mmap[std::string( type->fullName() )] = type;
 }
 
-const ObjectType* ObjectTypeFactory::tqfind( const char* name ) const
+const ObjectType* ObjectTypeFactory::find( const char* name ) const
 {
   maptype::const_iterator i = mmap.find( std::string( name ) );
   if ( i == mmap.end() ) return 0;

kig/objects/object_type_factory.h

@@ -34,7 +34,7 @@ class ObjectTypeFactory
 public:
   static ObjectTypeFactory* instance();
   void add( const ObjectType* type );
-  const ObjectType* tqfind( const char* name ) const;
+  const ObjectType* find( const char* name ) const;
 };
 
 #endif

kig/objects/other_imp.cc

@@ -56,7 +56,7 @@ AngleImp::AngleImp( const Coordinate& pt, double start_angle_in_radials,
 {
 }
 
-bool AngleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
+bool AngleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
 {
   double radius = 50*w.screenInfo().pixelWidth();
 
@@ -73,7 +73,7 @@ bool AngleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w )
 bool AngleImp::inRect( const Rect& r, int width, const KigWidget& w ) const
 {
   // TODO ?
-  return r.tqcontains( mpoint, w.screenInfo().normalMiss( width ) );
+  return r.contains( mpoint, w.screenInfo().normalMiss( width ) );
 }
 
 Coordinate AngleImp::attachPoint() const
@@ -179,7 +179,7 @@ void VectorImp::draw( KigPainter& p ) const
   p.drawVector( mdata.a, mdata.b );
 }
 
-bool VectorImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const
+bool VectorImp::contains( const Coordinate& o, int width, const KigWidget& w ) const
 {
   return internalContainsPoint( o, w.screenInfo().normalMiss( width ) );
 }
@@ -340,7 +340,7 @@ void ArcImp::draw( KigPainter& p ) const
   p.drawArc( mcenter, mradius, msa, ma );
 }
 
-bool ArcImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
+bool ArcImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
 {
   return internalContainsPoint( p, w.screenInfo().normalMiss( width ) );
 }

kig/objects/other_imp.h

@@ -49,7 +49,7 @@ public:
   ObjectImp* transform( const Transformation& ) const;
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& ) const;
   bool inRect( const Rect& r, int width, const KigWidget& ) const;
   Rect surroundingRect() const;
 
@@ -113,7 +113,7 @@ public:
   double getParam( const Coordinate&, const KigDocument& ) const;
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& ) const;
   bool inRect( const Rect& r, int width, const KigWidget& ) const;
   Rect surroundingRect() const;
 
@@ -186,7 +186,7 @@ public:
   ObjectImp* transform( const Transformation& t ) const;
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& w ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& w ) const;
   bool inRect( const Rect& r, int width, const KigWidget& si ) const;
   Rect surroundingRect() const;
   bool valid() const;

kig/objects/point_imp.cc

@@ -42,7 +42,7 @@ void PointImp::draw( KigPainter& p ) const
   p.drawFatPoint( mc );
 }
 
-bool PointImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
+bool PointImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
 {
   int twidth = width == -1 ? 5 : width;
   return (p - mc).length() - twidth*w.screenInfo().pixelWidth() < 0;
@@ -51,7 +51,7 @@ bool PointImp::tqcontains( const Coordinate& p, int width, const KigWidget& w )
 bool PointImp::inRect( const Rect& r, int width, const KigWidget& w ) const
 {
   double am = w.screenInfo().normalMiss( width );
-  return r.tqcontains( mc, am );
+  return r.contains( mc, am );
 }
 
 const uint PointImp::numberOfProperties() const

kig/objects/point_imp.h

@@ -54,7 +54,7 @@ public:
   void setCoordinate( const Coordinate& c );
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& ) const;
   bool inRect( const Rect& r, int width, const KigWidget& ) const;
 
   const uint numberOfProperties() const;

kig/objects/polygon_imp.cc

@@ -159,12 +159,12 @@ bool PolygonImp::isInPolygon( const Coordinate& p ) const
 }
 #define selectpolygonwithinside 1
 #ifdef selectpolygonwithinside
-bool PolygonImp::tqcontains( const Coordinate& p, int, const KigWidget& ) const
+bool PolygonImp::contains( const Coordinate& p, int, const KigWidget& ) const
 {
   return isInPolygon( p );
 }
 #else
-bool PolygonImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
+bool PolygonImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
 {
   bool ret = false;
   uint reduceddim = mpoints.size() - 1;

kig/objects/polygon_imp.h

@@ -53,7 +53,7 @@ public:
   ObjectImp* transform( const Transformation& ) const;
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& ) const;
   bool inRect( const Rect& r, int width, const KigWidget& ) const;
   bool valid() const;
   Rect surroundingRect() const;

kig/objects/text_imp.cc

@@ -51,9 +51,9 @@ void TextImp::draw( KigPainter& p ) const
   p.drawTextFrame( mboundrect, mtext, mframe );
 }
 
-bool TextImp::tqcontains( const Coordinate& p, int, const KigWidget& ) const
+bool TextImp::contains( const Coordinate& p, int, const KigWidget& ) const
 {
-  return mboundrect.tqcontains( p );
+  return mboundrect.contains( p );
 }
 
 bool TextImp::inRect( const Rect& r, int, const KigWidget& ) const

kig/objects/text_imp.h

@@ -30,7 +30,7 @@ class TextImp
   Coordinate mloc;
   bool mframe;
   // with this var, we keep track of the place we drew in, for use in
-  // the tqcontains() function..
+  // the contains() function..
   mutable Rect mboundrect;
 public:
   typedef ObjectImp Parent;
@@ -44,7 +44,7 @@ public:
   ObjectImp* transform( const Transformation& ) const;
 
   void draw( KigPainter& p ) const;
-  bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const;
+  bool contains( const Coordinate& p, int width, const KigWidget& ) const;
   bool inRect( const Rect& r, int width, const KigWidget& ) const;
   bool valid() const;
   Rect surroundingRect() const;

kig/pykig/pykig.py

@@ -491,7 +491,7 @@ data=(\
 
 def convstr(s):
   for o, n in DICT:
-    s=s.tqreplace(o, n)
+    s=s.replace(o, n)
   return s
 
 def databuild(nomeclasse, nomekig, v="val"):

kiten/deinf.cpp

@@ -74,7 +74,7 @@ void Deinf::Index::load()
 
 			Conjugation conj;
 			conj.ending = things.first();
-			conj.tqreplace = (*things.at(1));
+			conj.replace = (*things.at(1));
 			conj.num = things.last().toUInt();
 
 			list.append(conj);
@@ -110,10 +110,10 @@ TQStringList Deinf::Index::deinflect(const TQString &text, TQStringList &name)
 		{
 			name.append(names[(*it).num]);
 
-			//kdDebug() << "match ending: " << (*it).ending << "; tqreplace: " << (*it).tqreplace << "; name: " << names[(*it).num] << endl;
+			//kdDebug() << "match ending: " << (*it).ending << "; replace: " << (*it).replace << "; name: " << names[(*it).num] << endl;
 
 			TQString tmp(text);
-			tmp.tqreplace(TQRegExp((*it).ending + "*", false, true), (*it).tqreplace);
+			tmp.replace(TQRegExp((*it).ending + "*", false, true), (*it).replace);
 			ret.append(tmp);
 		}
 	}

kiten/deinf.h

@@ -30,7 +30,7 @@ namespace Deinf
 struct Conjugation
 {
 	TQString ending;
-	TQString tqreplace;
+	TQString replace;
 	unsigned int num;
 };
 

kiten/dict.cpp

@@ -342,7 +342,7 @@ SearchResult Index::scanResults(TQRegExp regexp, TQStringList results, bool comm
 		if (found >= 0)
 		{
 			++fullNum;
-			if ((*itr).tqfind(TQString("(P)")) >= 0 || !common)
+			if ((*itr).find(TQString("(P)")) >= 0 || !common)
 			{
 				// we append HERE, so we get the exact
 				// results we have in ret.list
@@ -398,7 +398,7 @@ SearchResult Index::scanKanjiResults(TQRegExp regexp, TQStringList results, bool
 			++fullNum;
 			// common entries have G[1-8] (jouyou)
 			TQRegExp comregexp(jmyCount ? "G[1-9]" : "G[1-8]");
-			if ((*itr).tqfind(comregexp) >= 0 || !common)
+			if ((*itr).find(comregexp) >= 0 || !common)
 			{
 				ret.list.append(kanjiParse(*itr));
 				++num;

kiten/edict

@@ -17776,7 +17776,7 @@
 リプリケート /(n) replicate/
 リプリント /reprint/
 リプル /(n) ripple/
-リプレース /tqreplace/
+リプレース /replace/
 リプレッション /repression/
 リプロタクション /reproduction/
 リベート /(n) (1) rebate/(2) commission/kickback/(P)/
@@ -19778,7 +19778,7 @@
 囲郭村 [いかくそん] /(n) walled settlement/walled town/
 囲碁 [いご] /(n) Go (board game of capturing territory)/(P)/
 囲碁三級 [いごさんきゅう] /third rank in the game of go/
-囲炉裏 [いろり] /(n) hearth/fitqreplace/
+囲炉裏 [いろり] /(n) hearth/fireplace/
 囲繞 [いじょう] /(n,vs) surrounding/enclosure/
 囲繞 [いにょう] /(n,vs) surrounding/enclosure/
 夷 [えびす] /(n) barbarian/savage/Ainu/
@@ -29853,7 +29853,7 @@
 掛け接 [かけはぎ] /invisible mending (of clothes)/
 掛け替え [かけがえ] /(n) replacement/
 掛け替えのない [かけがえのない] /(adj-pn) thing with no substitute/money can't buy/
-掛け替える [かけかえる] /(v1) to tqreplace/to substitute/
+掛け替える [かけかえる] /(v1) to replace/to substitute/
 掛け値 [かけね] /(n) inflated price/exaggeration/
 掛け渡す [かけわたす] /(v5s) to build (a bridge) over a river/
 掛け倒れ [かけだおれ] /(n) loss on a credit sale/
@@ -31056,7 +31056,7 @@
 憾み [うらみ] /(n) matter for regret/regret/
 憾む [うらむ] /(v5m) to curse/to feel bitter/
 換え [かえ] /(n) rate of exchange/
-換える [かえる] /(v1) to exchange/to interchange/to substitute/to tqreplace/(P)/
+換える [かえる] /(v1) to exchange/to interchange/to substitute/to replace/(P)/
 換わり [かわり] /an exchange transaction/
 換わる [かわる] /(v5r,vi) to take the place of/to relieve/to be substituted for/to be exchanged/to change places with/to take turns/to be replaced/
 換羽 [かんう] /(n) molting/
@@ -37954,9 +37954,9 @@
 掘り割り [ほりわり] /(n) canal/
 掘り起こす [ほりおこす] /(v5s) to dig up/
 掘り起す [ほりおこす] /(v5s) to reclaim/to dig up/
-掘り出し物 [ほりだしもの] /(n) (lucky) tqfind/bargain/good buy/treasure trove/
+掘り出し物 [ほりだしもの] /(n) (lucky) find/bargain/good buy/treasure trove/
 掘り出す [ほりだす] /(v5s) to dig out/to pick up/
-掘り当てる [ほりあてる] /(v1) to strike/to tqfind/to dig up/
+掘り当てる [ほりあてる] /(v1) to strike/to find/to dig up/
 掘り抜き井戸 [ほりぬきいど] /(n) artesian well/
 掘り抜く [ほりぬく] /(v5k) to dig through/to drill into/to excavate/
 掘り返す [ほりかえす] /(v5s) to dig up/to turn up/to tear up/
@@ -47371,7 +47371,7 @@
 差し掛かる [さしかかる] /(v5r) to come near to/to approach/(P)/
 差し掛ける [さしかける] /(v1) to hold (umbrella) over/
 差し掛け小屋 [さしかけごや] /a lean-to/
-差し換える [さしかえる] /(v1) to change/to tqreplace/
+差し換える [さしかえる] /(v1) to change/to replace/
 差し詰め [さしずめ] /(adv) for the time being/after all/
 差し許す [さしゆるす] /(v5s) to allow/to forgive/
 差し挟む [さしはさむ] /(v5m) to insert/to harbor/to slip in a word/
@@ -47411,7 +47411,7 @@
 差し前 [さしまえ] /(n) sword worn at one's side/
 差し足 [さしあし] /(n) stealthy steps/kick when one (horse) overtakes another/
 差し替え [さしかえ] /(n,vs) replacement/
-差し替える [さしかえる] /(v1) to change/to tqreplace/
+差し替える [さしかえる] /(v1) to change/to replace/
 差し担い [さしにない] /(n) carrying upon two persons' shoulders/
 差し置く [さしおく] /(v5k) to leave as is/to let alone/to disregard/
 差し潮 [さししお] /(n) rising tide/
@@ -48325,7 +48325,7 @@
 在りし日 [ありしひ] /(n-t) (1) days of yore/the olden days/(2) during one's lifetime/(P)/
 在り処 [ありか] /(n) location/whereabouts/hiding place/
 在り所 [ありか] /(n) location/whereabouts/hiding place/
-在り付く [ありつく] /(v5k) to get/to obtain/to come by/to tqfind/
+在り付く [ありつく] /(v5k) to get/to obtain/to come by/to find/
 在り方 [ありかた] /(n) the way something ought to be/
 在り来たり [ありきたり] /(adj-na) common/ordinary/
 在る [ある] /(v5r-i) to live/to be/(P)/
@@ -54618,7 +54618,7 @@
 取り巻き [とりまき] /(n) followers/hangers-on/
 取り巻き連 [とりまきれん] /(abbr) one's followers or hangers-on/
 取り巻く [とりまく] /(v5k) to surround/to circle/to enclose/(P)/
-取り換える [とりかえる] /(v1) to exchange/to tqreplace/
+取り換える [とりかえる] /(v1) to exchange/to replace/
 取り敢えず [とりあえず] /(adv,n) at once/first of all/for the time being/(P)/
 取り寄せる [とりよせる] /(v1) to order/to send away for/(P)/
 取り急ぎ [とりいそぎ] /(adv) in haste/
@@ -54685,7 +54685,7 @@
 取り舵 [とりかじ] /(n) port (side of a ship)/
 取り舵を取る [とりかじをとる] /(exp) steering to port/
 取り替え [とりかえ] /(n) swap/exchange/
-取り替える [とりかえる] /(v1) to exchange/to tqreplace/(P)/
+取り替える [とりかえる] /(v1) to exchange/to replace/(P)/
 取り代 [とりしろ] /portion/one's share/
 取り調べ [とりしらべ] /(n) investigation (e.g. by police or prosecutors)/examination/inquiry/(P)/
 取り調べる [とりしらべる] /(v1) to investigate/to examine/
@@ -54755,7 +54755,7 @@
 取引先 [とりひきさき] /(n) customer/client/
 取引日 [とりひきひ] /(n) trading day/
 取下げ [とりさげ] /(n) withdrawal/
-取換る [とりかえる] /(v1) to exchange/to tqreplace/
+取換る [とりかえる] /(v1) to exchange/to replace/
 取敢えず [とりあえず] /(adv,n) at once/first of all/for the time being/(P)/
 取極め [とりきめ] /(n) decision/agreement/
 取計らい [とりはからい] /(n) arrangement/
@@ -56015,8 +56015,8 @@
 拾い出す [ひろいだす] /(v5s) to single out/to select/
 拾い上げる [ひろいあげる] /(v1) to pick up/to pick out/
 拾い読み [ひろいよみ] /(n,vs) reading here and there/skimming through/
-拾い物 [ひろいもの] /(n) (1) a tqfind/(2) windfall/bargain/(P)/
+拾い物 [ひろいもの] /(n) (1) a find/(2) windfall/bargain/(P)/
-拾う [ひろう] /(v5u) to pick up/to tqfind/to gather/(P)/
+拾う [ひろう] /(v5u) to pick up/to find/to gather/(P)/
 拾遺 [しゅうい] /(n) gleaning(s)/
 拾集 [しゅうしゅう] /(n,vs) gathering up/collection/accumulation/
 拾得 [しゅうとく] /(n,vs) picking up/finding/(P)/
@@ -57381,7 +57381,7 @@
 出展者 [しゅってんしゃ] /exhibitors (at a trade show, etc.)/
 出店 [でみせ] /(n) food stand/branch store/(P)/
 出度 [しゅつど] /frequency/
-出土 [しゅつど] /(n) appearance of an archeological tqfind/(P)/
+出土 [しゅつど] /(n) appearance of an archeological find/(P)/
 出土品 [しゅつどひん] /(n) artifacts/
 出湯 [いでゆ] /(n) hot springs/
 出頭 [しゅっとう] /(n,vs) appearance/presence/(P)/
@@ -67247,7 +67247,7 @@
 切り株 [きりかぶ] /(n) stump/stubble/
 切り干し [きりぼし] /(n) dried daikon strips/
 切り換え [きりかえ] /(n) exchange/conversion/replacement/switching (to)/switchover/
-切り換える [きりかえる] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to tqreplace/to switch over/
+切り換える [きりかえる] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to replace/to switch over/
 切り換え時 [きりかえとき] /response time/time to switch over/
 切り換え時 [きりかえどき] /response time/time to switch over/
 切り岸 [きりぎし] /(n) steep bank/cliff/
@@ -67310,7 +67310,7 @@
 切り窓 [きりまど] /(n) windows cut out of a wall/
 切り揃える [きりそろえる] /(v1) to cut and even up/to cut several pieces to the same size/
 切り替え [きりかえ] /(n) exchange/conversion/replacement/switching (to)/switchover/(P)/
-切り替える [きりかえる] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to tqreplace/to switch over/
+切り替える [きりかえる] /(v1) to change/to exchange/to convert/to renew/to throw a switch/to replace/to switch over/
 切り替え時 [きりかえとき] /response time/time to switch over/
 切り替え時 [きりかえどき] /response time/time to switch over/
 切り替わる [きりかわる] /(v5r) to change completely/
@@ -70359,7 +70359,7 @@
 掃滅 [そうめつ] /(n,vs) wiping out/annihilation/
 挿し花 [さしばな] /(n) flowers in a vase or lapel/
 挿し絵 [さしえ] /(n) (book) illustration/
-挿し替える [さしかえる] /(v1) to change/to tqreplace/
+挿し替える [さしかえる] /(v1) to change/to replace/
 挿し木 [さしき] /(n) cutting/planting/
 挿す [さす] /(v5s) to insert/to put in/to graft/to wear in belt/
 挿花 [そうか] /(n) flower arrangement/
@@ -72366,7 +72366,7 @@
 堕力 [だりょく] /inertia/momentum/force of habit/
 妥協 [だきょう] /(n,vs) compromise/giving in/(P)/
 妥協案 [だきょうあん] /compromise plan/
-妥協点 [だきょうてん] /(n) (tqfind) common (meeting) ground/
+妥協点 [だきょうてん] /(n) (find) common (meeting) ground/
 妥結 [だけつ] /(n) agreement/(P)/
 妥当 [だとう] /(adj-na,n) valid/proper/right/appropriate/(P)/
 妥当性 [だとうせい] /(n) validity/verification/propriety/
@@ -72915,7 +72915,7 @@
 戴冠式 [たいかんしき] /(n) coronation/
 戴白 [たいはく] /old people/becoming gray haired/
 替え [かえ] /(n) change/alteration/substitute/(P)/
-替える [かえる] /(v1) to exchange/to interchange/to substitute/to tqreplace/(P)/
+替える [かえる] /(v1) to exchange/to interchange/to substitute/to replace/(P)/
 替え歌 [かえうた] /(n) parody (of a song)/
 替え玉 [かえだま] /(n) substitute/double/(P)/
 替え心 [かえしん] /(n) spare lead/
@@ -73139,7 +73139,7 @@
 代々 [だいだい] /(n-adv,n-t) for generations/hereditary/generation after generation/
 代々 [よよ] /(n-adv,n-t) for generations/hereditary/generation after generation/
 代え [かえ] /(n) substitute/proxy/
-代える [かえる] /(v1) to exchange/to interchange/to substitute/to tqreplace/(P)/
+代える [かえる] /(v1) to exchange/to interchange/to substitute/to replace/(P)/
 代が変わる [だいがかわる] /(exp) to change hands/to be succeeded/
 代り [かわり] /(n) substitute/deputy/proxy/alternate/relief/compensation/second helping/
 代りに [かわりに] /instead of/
@@ -73228,7 +73228,7 @@
 代代 [よよ] /(n-adv,n-t) for generations/hereditary/generation after generation/
 代代伝わる [だいだいつたわる] /to be transmitted (handed down) from generation to generation/
 代地 [だいち] /(n) substitute land/
-代置 [だいち] /(n,vs) tqreplace/
+代置 [だいち] /(n,vs) replace/
 代読 [だいどく] /(n,vs) reading for another/
 代入 [だいにゅう] /(n) substitution/
 代任 [だいにん] /(n) agency/acting official/
@@ -75020,7 +75020,7 @@
 暖房器具 [だんぼうきぐ] /(n) home heater/
 暖流 [だんりゅう] /(n) warm current/(P)/
 暖簾 [のれん] /(n) (uk) (short) sign curtain hung at shop entrance/reputation (of a store)/(P)/
-暖炉 [だんろ] /(n) fitqreplace/hearth/stove/(P)/
+暖炉 [だんろ] /(n) fireplace/hearth/stove/(P)/
 檀家 [だんか] /(n) family which supports a temple/parishioner/
 檀家 [だんけ] /(n) family which supports a temple/parishioner/
 檀君 [だんくん] /mythical founder of Korea/
@@ -75572,7 +75572,7 @@
 置き引き [おきびき] /(n) walking away with another's baggage/
 置き屋 [おきや] /(n) geisha dwelling/
 置き火燵 [おきごたつ] /(n) portable brazier/
-置き換える [おきかえる] /(v1) to tqreplace/to move/to change the position of/
+置き換える [おきかえる] /(v1) to replace/to move/to change the position of/
 置き去り [おきざり] /(n) desertion/leaving behind or in the lurch/(P)/
 置き傘 [おきがさ] /(n) spare umbrella kept (at work) in the event of a sudden shower/
 置き字 [おきじ] /(n) kanji left unpronounced when reading Chinese/
@@ -84609,7 +84609,7 @@
 入れ違う [いれちがう] /(v5u) to pass each other/to cross paths/
 入れ違える [いれちがえる] /(v1) to misplace/
 入れ換え [いれかえ] /(n) replacement/substitution/change/
-入れ換える [いれかえる] /(v1) to tqreplace/to substitute/to shift/to change places/
+入れ換える [いれかえる] /(v1) to replace/to substitute/to shift/to change places/
 入れ交ぜる [いれまぜる] /(v1,vt) to mix/
 入れ合わせる [いれあわせる] /(v1) to make up for/
 入れ込む [いれこむ] /(v5m) to put forth (effort)/
@@ -84621,11 +84621,11 @@
 入れ質 [いれじち] /pawning/
 入れ食い [いれぐい] /(exp) (fish) biting at every cast/
 入れ替え [いれかえ] /(n) replacement/substitution/change/(P)/
-入れ替える [いれかえる] /(v1) to tqreplace/to substitute/to shift/to change places/
+入れ替える [いれかえる] /(v1) to replace/to substitute/to shift/to change places/
 入れ替わり [いれかわり] /(n) substitution/replacement/shifting/change/
 入れ替わり立ち替わり [いれかわりたちかわり] /(adv) by turns/
 入れ替わる [いれかわる] /(v5r,vi) to change places/to relieve one another/
-入れ代える [いれかえる] /(v1) to tqreplace/to substitute/to shift/to change places/
+入れ代える [いれかえる] /(v1) to replace/to substitute/to shift/to change places/
 入れ代わり立ち代わり [いれかわりたちかわり] /(adv) by turns/
 入れ代わる [いれかわる] /(v5r,vi) to change places/to relieve one another/
 入れ知恵 [いれぢえ] /(n) suggestion/hint/
@@ -90548,7 +90548,7 @@
 付け回す [つけまわす] /(v5s) to follow/to shadow/to hanker after/to hover around/
 付け回る [つけまわる] /(v5r) to follow/to shadow/to hanker after/to hover around/
 付け掛け [つけかけ] /(n) overcharge/
-付け換える [つけかえる] /(v1) to renew/to tqreplace/to change for/to attach anew/
+付け換える [つけかえる] /(v1) to renew/to replace/to change for/to attach anew/
 付け景気 [つけげいき] /(n) borrowed prosperity/
 付け元気 [つけげんき] /(n) show of courage/
 付け合わせ [つけあわせ] /(n) perfect occlusion/vegetable relish with meat/
@@ -90571,7 +90571,7 @@
 付け足す [つけたす] /(v5s) to add to/(P)/
 付け足り [つけたり] /addition/pretext/
 付け替え [つけかえ] /(n) replacement/
-付け替える [つけかえる] /(v1) to renew/to tqreplace/to change for/to attach anew/
+付け替える [つけかえる] /(v1) to renew/to replace/to change for/to attach anew/
 付け値 [つけね] /(n) the bid/the offer/
 付け知恵 [つけじえ] /hint suggestion/
 付け直す [つけなおす] /(v5s) to repair again/to join again/
@@ -95798,7 +95798,7 @@
 殆ど [ほとんど] /(n-adv,n-t) (uk) mostly/almost/(P)/
 殆んど [ほとんど] /(n-adv,n-t) (uk) mostly/almost/
 堀 [ほり] /(n) moat/canal/(P)/
-堀り出し物 [ほりだしもの] /(n) (lucky) tqfind/bargain/good buy/treasure trove/
+堀り出し物 [ほりだしもの] /(n) (lucky) find/bargain/good buy/treasure trove/
 堀り鼠 [ほりねずみ] /gopher/
 堀り抜く [ほりぬく] /(iK) (v5k) to dig through/to drill into/to excavate/
 堀り返す [ほりかえす] /(iK) (v5s) to dig up/to turn up/to tear up/
@@ -98489,13 +98489,13 @@
 儲け口 [もうけぐち] /(n) profitable job/way to make a fast buck/
 儲け主義 [もうけしゅぎ] /moneymaking orientation/
 儲け付くで [もうけづくで] /for investment/to make money/
-儲け物 [もうけもの] /(n) good bargain/a tqfind/godsend/
+儲け物 [もうけもの] /(n) good bargain/a find/godsend/
 儲け役 [もうけやく] /(n) lucrative position/
 儲位 [ちょい] /(n) heirship/
 儲口 [もうけぐち] /(n) profitable job/way to make a fast buck/
 儲蓄 [ちょちく] /(n) savings/
 儲付くで [もうけづくで] /for investment/to make money/
-儲物 [もうけもの] /(n) good bargain/a tqfind/godsend/
+儲物 [もうけもの] /(n) good bargain/a find/godsend/
 儲役 [もうけやく] /(n) lucrative position/
 木 [き] /(n) tree/wood/timber/(P)/
 木々 [きぎ] /(n) every tree/many trees/all kinds of trees/(P)/
@@ -98700,7 +98700,7 @@
 目くじら [めくじら] /(n) corner of one's eye/
 目ざとい [めざとい] /(adj) (1) sharp sighted/(2) easily awakened/
 目ざわり [めざわり] /(adj-na,n) eyesore/
-目っけ物 [めっけもの] /(n) bargain/tqfind/
+目っけ物 [めっけもの] /(n) bargain/find/
 目つぶし [めつぶし] /(n) thing thrown in someone's eyes in order to blind/
 目にあう [めにあう] /(exp) to go through/to suffer/
 目につく [めにつく] /(v5k) to be noticeable/
@@ -99974,7 +99974,7 @@
 有り難味 [ありがたみ] /(n) value/worth/virtue/
 有り難迷惑 [ありがためいわく] /(adj-na,n) an unwelcome favor/
 有り難涙 [ありがたなみだ] /(n) tears of gratitude/
-有り付く [ありつく] /(v5k) to get/to obtain/to come by/to tqfind/
+有り付く [ありつく] /(v5k) to get/to obtain/to come by/to find/
 有り布 [ありぎれ] /(n) remnants/
 有り明け [ありあけ] /(n) dawn or daybreak (with the moon still visible)/all night/
 有り余っている [ありあまっている] /to be in excess/
@@ -106313,7 +106313,7 @@
 煌煌と [こうこうと] /brilliantly/brightly/
 煖気 [だんき] /(n) warmth/warm weather/
 煖房 [だんぼう] /(n) heating/
-煖炉 [だんろ] /(n) fitqreplace/hearth/stove/
+煖炉 [だんろ] /(n) fireplace/hearth/stove/
 熏し銀 [いぶしぎん] /(n) (1) oxidized silver/(2) refined (aesthetic) taste/
 熏蒸 [くんじょう] /fumigation/
 熏蒸剤 [くんじょうざい] /fumigant/

kiten/kanjidic

@@ -325,7 +325,7 @@
 格 334A U683c B75 G5 S10 F281 N2259 V2668 H926 DK627 L292 K334 O1099 DO716 MN14749 MP6.0309 E633 IN643 DS569 DT710 DC403 DJ852 DG1088 P1-4-6 I4a6.17 Q4796.4 DR1877 Yge2 Yge1 Wgyeog Wnag カク コウ キャク ゴウ T1 いたる のり {status} {rank} {capacity} {character} {case (law, grammar)} 
 核 334B U6838 B75 G8 S10 F475 N2254 V2660 H927 DK628 L1520 K577 DO1608 MN14743 MP6.0305 E1074 IN1212 DJ986 DG1089 P1-4-6 I4a6.22 Q4098.2 DR1862 Yhe2 Yhu2 Whaeg カク {nucleus} {core} {kernel} 
 殻 334C U6bbb B79 G8 S11 XJ05D57 XJ1385E F1892 N2456 V2996 H1490 DK1000 L710 K1869 DO1832 E1075 IN1728 DJ1626 DG1141 P1-7-4 I3p8.1 Q4724.7 DR1468 Yke2 Yqiao4 Wgag カク コク バイ から がら {husk} {nut shell} 
-獲 334D U7372 B94 G8 S16 XH1622 F964 N2912 V3609 H779 DK537 L701 K1234 DO1364 MN20758X MP7.0752 E1079 IN1313 DJ1408 DG1310 P1-3-13 I3g13.1 Q4424.7 DR2967 Yhuo4 Whoeg カク え.る {seize} {get} {tqfind} {earn} {acquire} {can} {may} {able to} 
+獲 334D U7372 B94 G8 S16 XH1622 F964 N2912 V3609 H779 DK537 L701 K1234 DO1364 MN20758X MP7.0752 E1079 IN1313 DJ1408 DG1310 P1-3-13 I3g13.1 Q4424.7 DR2967 Yhuo4 Whoeg カク え.る {seize} {get} {find} {earn} {acquire} {can} {may} {able to} 
 確 334E U78ba B112 G5 S15 XJ15021 F252 N3217 V4039 H1228 DK830 L567 K395 O2305 DO661 MN24366 MP8.0388 E634 IN603 DS570 DT805 DC343 DJ803 DG1409 P1-5-10 I5a10.3 Q1461.4 DR3375 Yque4 Whwag カク コウ たし.か たし.かめる {assurance} {firm} {tight} {hard} {solid} {confirm} {clear} {evident} 
 穫 334F U7a6b B115 G8 S18 F1642 N3309 V4180 H1251 DK844 L908 K1683 O2729 DO1807 MN25334P MP8.0635 E1081 IN1314 DJ1409 DG1449 P1-5-13 I5d13.4 Q2494.7 DR2267 Yhuo4 Whwag カク {harvest} {reap} 
 覚 3350 U899a B147 G4 S12 XJ06B34 XJ15D26 XH1700 F710 N4288 V5529 H2604 DK1668 L325 K896 O1752 DO397 MN34846 MP10.0328 E439 IN605 DS363 DT581 DJ208 DB3.15 DG1646 P2-5-7 I3n9.3 Q3221.6 Q9021.6 DR957 Yjue2 Yjiao4 Wgag Wgyo カク おぼ.える さ.ます さ.める さと.る {memorize} {learn} {remember} {awake} {sober up} 
@@ -1226,7 +1226,7 @@
 州 3D23 U5dde B2 G3 S6 XDR0354 F386 N99 V1529 H57 DK39 L128 K542 O224 DO445 MN8678 MP4.0331 E304 IN195 DS424 DT271 DJ553 DG549 P1-2-4 I2f4.1 Q3200.0 DR1254 ZPP1-1-5 Yzhou1 Wju シュウ ス す T1 くに {state} {province} 
 修 3D24 U4fee B9 G5 S10 XJ13143 F603 N491 V260 H123 DK92 L1722 K644 O1038 DO563 MN721 MP1.0805 E704 IN945 DS633 DT715 DJ1175 DG107 P1-2-8 I2a8.11 Q2822.2 Q2722.2 DR2160 ZPP1-3-7 Yxiu1 Wsu シュウ シュ おさ.める おさ.まる T1 おき なが のぶ おさむ {discipline} {conduct oneself well} {study} {master} 
 愁 3D25 U6101 B61 G8 S13 F2171 N1729 V1923 H2829 DK1811 L901 K1737 DO1778 MN10885 MP4.1107 E1357 IN1601 DJ1700 DG795 P2-9-4 I4k9.16 Q2933.8 DR2258 Ychou2 Wsu シュウ うれ.える うれ.い {distress} {grieve} {lament} {be anxious} 
-拾 3D26 U62fe B64 G3 S9 F1479 N1901 V2149 H379 DK279 L667 K1599 O802 DO625 MN12014 MP5.0209 E305 IN1445 DS425 DT329 DJ273 DG890 P1-3-6 I3c6.14 Q5806.1 DR1377 Yshi2 Yshe4 Wseub Wsib シュウ ジュウ ひろ.う {pick up} {gather} {tqfind} {go on foot} {ten} 
+拾 3D26 U62fe B64 G3 S9 F1479 N1901 V2149 H379 DK279 L667 K1599 O802 DO625 MN12014 MP5.0209 E305 IN1445 DS425 DT329 DJ273 DG890 P1-3-6 I3c6.14 Q5806.1 DR1377 Yshi2 Yshe4 Wseub Wsib シュウ ジュウ ひろ.う {pick up} {gather} {find} {go on foot} {ten} 
 洲 3D27 U6d32 B85 G9 S9 F1979 N2539 V3120 H391 DK291 L2289 O820 MN17413 MP6.1116 IN2138 P1-3-6 I3a6.10 Q3210.0 Yzhou1 Wju シュウ ス しま {continent} {sandbar} {island} {country} 
 秀 3D28 U79c0 B115 G8 S7 F848 N3263 V4123 H2545 DK1616 L914 K859 O726 DO973 MN24911 MP8.0523 E1355 IN1683 DJ1171 DG1429 P2-5-2 I5d2.4 Q2022.7 DR2245 ZPP2-1-6 ZSP2-5-3 ZBP2-1-7 Yxiu4 Wsu シュウ ひい.でる T1 しゅ しょう ひで ひでし ほ {excel} {excellence} {beauty} {surpass} 
 秋 3D29 U79cb B115 G2 S9 XJ0302C XJ06354 F635 N3273 V4131 H1139 DK776 L900 K540 O878 DO164 MN24940 MP8.0537 E140 IN462 DS89 DT178 DJ98 DB2.20 DG1431 P1-5-4 I5d4.1 Q2998.0 DR2262 Yqiu1 Wchu シュウ あき とき T1 あい {autumn} 
@@ -1759,7 +1759,7 @@
 隊 4262 U968a B170 G4 S12 F605 N5010 V6468 H625 DK452 L1306 K470 DO366 MN41750X MP11.0945 E540 IN795 DS462 DT593 DC225 DJ779 DG746 P1-3-9 I2d9.7 Q7823.2 DR3651 Ydui4 Wdae タイ {regiment} {party} {company} {squad} 
 黛 4263 U9edb B203 G9 S16 F2254 N5408 V7060 DK1678 L2864 MN48075X MP12.1022 IN2283 P2-5-11 I4d13.7 Q2333.1 Ydai4 Wdae タイ まゆずみ {blackened eyebrows} 
 鯛 4264 U9bdb B195 G9 S19 XJ16A57 F2446 N5305 V6884 H1881 DK1213 L2812 O2832 DO1971 MN46226P MP12.0752 IN2272 P1-11-8 I11a8.11 Q2732.0 Ydiao1 Wjo チョウ たい {sea bream} {red snapper} 
-代 4265 U4ee3 B9 G3 S5 F66 N364 V125 H30 DK18 L1005 K68 O125 DO85 MN386 MP1.0611 E338 IN256 DS463 DT257 DC87 DJ413 DB2.10 DB3.3 DG61 P1-2-3 I2a3.3 Q2324.0 DR2156 Ydai4 Wdae ダイ タイ か.わる かわ.る かわ.り -がわ.り か.える よ しろ T1 す {substitute} {change} {convert} {tqreplace} {period} {age} {generation} {charge} {rate} {fee} 
+代 4265 U4ee3 B9 G3 S5 F66 N364 V125 H30 DK18 L1005 K68 O125 DO85 MN386 MP1.0611 E338 IN256 DS463 DT257 DC87 DJ413 DB2.10 DB3.3 DG61 P1-2-3 I2a3.3 Q2324.0 DR2156 Ydai4 Wdae ダイ タイ か.わる かわ.る かわ.り -がわ.り か.える よ しろ T1 す {substitute} {change} {convert} {replace} {period} {age} {generation} {charge} {rate} {fee} 
 台 4266 U53f0 B28 C30 G2 S5 XJ0674A XJ13747 F262 N848 V699 H2005 DK1265 L744 K216 O276 DO290 MN3246 MP2.0757 E166 IN492 DS272 DT111 DC436 DJ532 DB3.2 DG280 P2-2-3 I3d2.11 Q2360.0 DR2777 Ytai2 Ytai1 Wtae Wi ダイ タイ うてな われ つかさ {pedestal} {a stand} {counter for machines and vehicles} 
 大 4267 U5927 B37 G1 S3 F7 N1171 V1133 H3416 DK2133 L107 K7 O48 DO32 MN5831 MP3.0367 E53 IN26 DS22 DT14 DC5 DJ87 DB2.2 DG408 P4-3-4 I0a3.18 Q4003.0 DR1463 Yda4 Ydai4 Wdae Wda Wtae ダイ タイ おお- おお.きい -おお.いに T1 うふ お おう た たかし とも はじめ ひろ ひろし まさ まさる もと わ {large} {big} 
 第 4268 U7b2c B118 G3 S11 F160 N3385 V4272 H2660 DK1706 L1239 K76 O1768 DO360 MN25943 MP8.0760 E339 IN404 DS273 DT380 DC83 DJ354 DG1473 P2-6-5 I6f5.5 Q8822.7 DR2344 Ydi4 Wje ダイ テイ {No.} {residence} 
@@ -2098,7 +2098,7 @@
 峠 463D U5ce0 B46 G8 S9 F1941 N1416 V1464 H358 DK265 L773 K1751 O1081 DO1473 MN8068 MP4.0247 E1663 IN1351 DJ1849 DG542 P1-3-6 I3o6.3 Q2173.1 DR1254 Wsang とうげ {mountain peak} {mountain pass} {climax} {crest} {(kokuji)} 
 鴇 463E U9d07 B196 S15 V6943 O2280 MN46730 MP12.0807 P1-4-11 I11b4.3 Q4742.7 Ybao3 Wbo ホウ とき のがん {wild goose} {madam of a brothel} {crested ibis} 
 匿 463F U533f B22 C23 G8 S10 F2024 N764 V591 H3011 DK1911 L1692 K1693 DO1766 MN2690 MP2.0475 E1664 IN1771 DJ1716 DG238 P3-2-8 I2t8.2 Q7171.6 DR3475 Yni4 Wnig トク かくま.う {hide} {shelter} {shield} 
-得 4640 U5f97 B60 G4 S11 F175 N1622 V1755 H477 DK351 L876 K358 O1299 DO340 MN10137 MP4.0873 E761 IN374 DS850 DT574 DC167 DJ643 DG631 P1-3-8 I3i8.4 Q2624.1 DR2048 Yde2 Yde5 Ydei3 Wdeug トク え.る う.る T1 あつ てろ {gain} {get} {tqfind} {earn} {acquire} {can} {may} {able to} {profit} {advantage} {benefit} 
+得 4640 U5f97 B60 G4 S11 F175 N1622 V1755 H477 DK351 L876 K358 O1299 DO340 MN10137 MP4.0873 E761 IN374 DS850 DT574 DC167 DJ643 DG631 P1-3-8 I3i8.4 Q2624.1 DR2048 Yde2 Yde5 Ydei3 Wdeug トク え.る う.る T1 あつ てろ {gain} {get} {find} {earn} {acquire} {can} {may} {able to} {profit} {advantage} {benefit} 
 徳 4641 U5fb3 B60 G5 S14 F1091 N1633 V1767 H684 DK486 L885 K839 O2063 DO592 MN10237P MP4.0918 E762 IN1038 DS851 DT801 DJ644 DG637 P1-3-11 I3i11.3 Q2423.6 DR2058 Yde2 Wdeog トク T1 あつ なる のり ゆき よし {benevolence} {virtue} {goodness} {commanding respect} 
 涜 4642 U6d9c B85 S10 XJ1492C V3134 L2297 MN18591X MP7.0331 P1-3-7 Q3418.6 Ydu2 Wdog トク トウ けが.す けが.れ みぞ {defile} {blaspheme} {ditch} 
 特 4643 U7279 B93 G4 S10 F234 N2860 V3541 H945 DK641 L246 K153 DO411 MN20013 MP7.0644 E760 IN282 DS685 DT554 DC186 DJ398 DB2.18 DG1293 P1-4-6 I4g6.1 Q2454.1 DR2448 Yte4 Wteug トク {special} 
@@ -4471,7 +4471,7 @@
 燹 6021 U71f9 B86 S18 N2815 V3501 MN19508 MP7.0552 P2-14-4 I4d14.5 Q1180.9 Yxian3 Wheui Wseon セン のび {prairie fire} 
 燿 6022 U71ff B86 G9 S18 XJ04D54 N2814 V3500 DK750 L2534 O2721 MN19520X MP7.0553 IN2152 P1-4-14 I4d14.3 Q9781.4 Yyao4 Wyo ヨウ かがや.く ひかり {shine} 
 爍 6023 U720d B86 S19 V3504 MN19549 MP7.0555 P1-4-15 I4d15.1 Q9289.4 Yshuo4 Wsag シャク とか.す ひか.る {shine} {melt} 
-爐 6024 U7210 B86 S20 XJ04F27 XH2750 N2819 V3506 H1104 MN19566 MP7.0556 P1-4-16 Q9181.7 Ylu2 Wro ロ いろり {fitqreplace} {stove} {oven} {furnace} 
+爐 6024 U7210 B86 S20 XJ04F27 XH2750 N2819 V3506 H1104 MN19566 MP7.0556 P1-4-16 Q9181.7 Ylu2 Wro ロ いろり {fireplace} {stove} {oven} {furnace} 
 爛 6025 U721b B86 S21 XJ14A47 N2820 V3507 H1110 O2913 MN19604 MP7.0559 P1-4-17 I4d17.1 Q9782.0 ZPP1-1-20 Ylan4 Wran ラン ただ.れる {be sore} {inflamed} {bleary} {fester} 
 爨 6026 U7228 B86 S29 N2821 V3508 MN19648 MP7.0562 P2-14-15 I4d26.1 Q7780.9 Ycuan4 Wchan サン かし.ぐ かまど {cook} {boil} 
 爭 6027 U722d B87 S8 XJ04168 XH186 V3510 H2422 O706 MN19663 MP7.0566 P2-4-4 Q2050.7 Yzheng1 Wjaeng ソウ あらそ.う いか.でか {to dispute} {fight} {contend} {strive} 
@@ -5923,8 +5923,8 @@
 鑠 6F4B U9460 B167 S23 XH3124 N4928 V6366 MN41019 MP11.0654 P1-8-15 I8a15.1 Q8219.4 Yshuo4 Wsag シャク とろ.かす と.かす {melt} {be charmed} {captivated} 
 鑢 6F4C U9462 B167 S23 N4927 V6365 MN41021 MP11.0655 P1-8-15 I8a15.5 Q8113.6 Ylu:4 Wryeo ロ リョ やすり {file} {rasp} 
 鑞 6F4D U945e B167 S23 N4929 V6367 MN41014 MP11.0654 P1-8-15 I8a15.4 Q8211.6 Yla4 Wrab ロウ {solder} 
-鑪 6F4E U946a B167 S24 XJ06F4F XH4822 N4931 V6369 MN41038 MP11.0656 P1-8-16 I8a16.1 Q8111.7 Ylu2 Wro ロ いろり T1 たたら {hearth} {fitqreplace} {furnace} 
+鑪 6F4E U946a B167 S24 XJ06F4F XH4822 N4931 V6369 MN41038 MP11.0656 P1-8-16 I8a16.1 Q8111.7 Ylu2 Wro ロ いろり T1 たたら {hearth} {fireplace} {furnace} 
-鈩 6F4F U9229 B167 S12 XJ06F4E N4822 V6228 P1-8-4 Q8312.7 Ylu2 Wro ロ いろり {hearth} {fitqreplace} {furnace} 
+鈩 6F4F U9229 B167 S12 XJ06F4E N4822 V6228 P1-8-4 Q8312.7 Ylu2 Wro ロ いろり {hearth} {fireplace} {furnace} 
 鑰 6F50 U9470 B167 S25 N4933 V6371 O2998 MN41051 MP11.0657 P1-8-17 I8a17.1 Q8812.7 Q8317.7 Yyao4 Yyue4 Wyag ヤク かぎ {lock} 
 鑵 6F51 U9475 B167 S25 XH3634 XI2k4.6 N4932 V6370 MN41064X MP11.0658 P1-8-17 Q8411.4 Yguan4 Wgwan カン かま {steam boiler} 
 鑷 6F52 U9477 B167 S26 V6373 MN41069 MP11.0658 P1-8-18 I8a18.1 Q8114.1 Ynie4 Wseob セツ ジョウ ニョウ けぬき T1 けぬ {pluck hair} {tweezers} 

kiten/kiten.cpp

@@ -80,8 +80,8 @@ TopLevel::TopLevel(TQWidget *tqparent, const char *name) : KMainWindow(tqparent,
 	kanjiCB = new KToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle");
 	deinfCB = new KToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle");
 	comCB = new KToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(toggleCom()), actionCollection(), "common");
-	autoSearchToggle = new KToggleAction(i18n("&Automatically Search Clipboard Selections"), "tqfind", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
+	autoSearchToggle = new KToggleAction(i18n("&Automatically Search Clipboard Selections"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
-	irAction =  new KAction(i18n("Search &in Results"), "tqfind", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results");
+	irAction =  new KAction(i18n("Search &in Results"), "find", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results");
 	(void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
 	addAction = new KAction(i18n("Add &Kanji to Learning List"), 0, TQT_TQOBJECT(this), TQT_SLOT(addToList()), actionCollection(), "add");
 	addAction->setEnabled(false);
@@ -396,7 +396,7 @@ void TopLevel::search(bool inResults)
 				TQStringList::Iterator nit = names.begin();
 				for (TQStringList::Iterator it = res.begin(); it != res.end(); ++it, ++nit)
 				{
-					if (done.tqcontains(*it) > 0)
+					if (done.contains(*it) > 0)
 						continue;
 
 					//kdDebug() << "currently on deinflection " << *it << endl;
@@ -442,7 +442,7 @@ void TopLevel::strokeSearch()
 	if (!ok)
 	{
 		/*
-		if (text.tqfind("-") < 0)
+		if (text.find("-") < 0)
 		{
 			StatusBar->message(i18n("For a range between 4 and 8 strokes, use '4-8'"));
 			return;
@@ -540,7 +540,7 @@ TQString TopLevel::filteredClipboardText()
 {
 	TQString newText = clipBoardText();
 	TQString currentText = Edit->text();
-	if (newText.length() < 80 && newText.tqfind(':') < 0 && newText.tqfind('#') < 0 && newText.tqfind("-") != 0 && newText.tqfind("+") < 0 && currentText.tqfind(newText) < 0)
+	if (newText.length() < 80 && newText.find(':') < 0 && newText.find('#') < 0 && newText.find("-") != 0 && newText.find("+") < 0 && currentText.find(newText) < 0)
 		return newText;
 	else
 		return TQString();
@@ -711,8 +711,8 @@ TQRegExp TopLevel::searchItems()
 	if (text.isEmpty())
 		return TQRegExp(); //empty
 
-	unsigned int tqcontains = text.tqcontains(TQRegExp("[A-Za-z0-9_:]"));
+	unsigned int contains = text.contains(TQRegExp("[A-Za-z0-9_:]"));
-	if (Config::wholeWord() && tqcontains == text.length())
+	if (Config::wholeWord() && contains == text.length())
 		regexp = "\\W%1\\W";
 	else
 		regexp = "%1";

kiten/kromajiedit.cpp

@@ -163,21 +163,21 @@ void KRomajiEdit::keyPressEvent(TQKeyEvent *e)
 	ji = ji.lower();
 	//kdDebug() << "ji = " << ji << endl;
 
-	TQString tqreplace;
+	TQString replace;
 
 	//kdDebug () << "kana is " << kana << endl;
 	if (kana == "hiragana")
-		tqreplace = hiragana[ji];
+		replace = hiragana[ji];
 	else if (kana == "katakana")
-		tqreplace = katakana[ji];
+		replace = katakana[ji];
 
-	//kdDebug() << "tqreplace = " << tqreplace << endl;
+	//kdDebug() << "replace = " << replace << endl;
 
-	if (!!tqreplace) // if (replace has something in it)
+	if (!!replace) // if (replace has something in it)
 	{
 		//kdDebug() << "replace isn't empty\n";
 
-		setText(curKana + tqreplace);
+		setText(curKana + replace);
 
 		if (kana == "katakana")
 			kana = "hiragana";

kiten/learn.cpp

@@ -473,8 +473,8 @@ void Learn::add(Dict::Entry toAdd, bool noEmit)
 {
 	// Remove peripheral readings: This is a study mode, not a reference mode
 	TQRegExp inNames (",\\s*[A-Za-z ]+:.*");
-	TQString readings = Dict::prettyKanjiReading(toAdd.readings()).tqreplace(inNames, "");
+	TQString readings = Dict::prettyKanjiReading(toAdd.readings()).replace(inNames, "");
-	TQString meanings = shortenString(Dict::prettyMeaning(toAdd.meanings()).tqreplace(inNames, ""));
+	TQString meanings = shortenString(Dict::prettyMeaning(toAdd.meanings()).replace(inNames, ""));
 	TQString kanji = toAdd.kanji();
 
 	// here's a dirty rotten cheat (well, not really)
@@ -730,7 +730,7 @@ TQString Learn::randomMeaning(TQStringList &oldMeanings)
 		}
 		//kdDebug() << "curMeaning: " << curItem->text(guessOn) << endl;
 	}
-	while (oldMeanings.tqcontains(meaning) || meaning == curItem->text(guessOn));
+	while (oldMeanings.contains(meaning) || meaning == curItem->text(guessOn));
 
 	oldMeanings.append(meaning);
 	meaning = shortenString(meaning);
@@ -755,9 +755,9 @@ void Learn::qupdate()
 
 	TQStringList oldMeanings;
 	for (int i = 0; i < numberOfAnswers; ++i)
-		answers->tqfind(i)->setText(randomMeaning(oldMeanings));
+		answers->find(i)->setText(randomMeaning(oldMeanings));
 
-	answers->tqfind(seikai)->setText(curItem->text(guessOn));
+	answers->find(seikai)->setText(curItem->text(guessOn));
 }
 
 struct Learn::scoreCompare 
@@ -834,7 +834,7 @@ void Learn::qnew() // new quiz kanji
 
 void Learn::cheat()
 {
-	answers->tqfind(seikai)->setFocus();
+	answers->find(seikai)->setFocus();
 	statusBar()->message(i18n("Better luck next time"));
 	nogood = true;
 }

kiten/optiondialog.cpp

@@ -45,7 +45,7 @@ ConfigureDialog::ConfigureDialog(TQWidget *tqparent, const char *name) : KConfig
 	configDic = new ConfigDictionaries(0, "dictionaries_page");
 	connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons()));
 	addPage(configDic, i18n("Dictionaries"), "contents");
-	addPage(new ConfigSearching(0, "searching_page"), i18n("Searching"), "tqfind");
+	addPage(new ConfigSearching(0, "searching_page"), i18n("Searching"), "find");
 	addPage(new ConfigLearn(0, "learn_page"), i18n("Learn"), "pencil");
 	ConfigFont* configFont = new ConfigFont(0, "font_page");
 	configFont->kcfg_font->setSampleText(i18n("Result View Font")+TQString::fromUtf8(" - いろはにほへと 漢字"));

kiten/rad.cpp

@@ -174,11 +174,11 @@ TQStringList Rad::kanjiByRad(const TQStringList &list)
 		for (TQValueList<TQStringList>::Iterator it = lists.begin(); it != lists.end(); ++it)
 		{
 			//kdDebug() << "looping through lists\n";
-			outcomes.append((*it).tqcontains(*kit) > 0);
+			outcomes.append((*it).contains(*kit) > 0);
 		}
 
 		const bool containsBool = false;
-		if ((outcomes.tqcontains(containsBool) < 1))
+		if ((outcomes.contains(containsBool) < 1))
 		{
 			//kdDebug() << "appending " << *kit << endl;
 			ret.append(*kit);
@@ -198,7 +198,7 @@ Radical Rad::radByKanji(const TQString &text)
 	TQString ret;
 
 	TQValueListIterator<Radical> it;
-	for (it = list.end(); it != list.begin() && (*it).kanji().tqfind(text) == -1; --it);
+	for (it = list.end(); it != list.begin() && (*it).kanji().find(text) == -1; --it);
 
 	return (*it);
 }
@@ -360,7 +360,7 @@ void RadWidget::addRadical(const TQString &radical)
 
 void RadWidget::addToSelected(const TQString &text)
 {
-	if (!text.isNull() && !selected.tqcontains(text))
+	if (!text.isNull() && !selected.contains(text))
 	{
 		selectedList->insertItem(text);
 		selected.append(text);
@@ -398,7 +398,7 @@ void RadWidget::apply()
 
 	for (TQStringList::Iterator it = selected.begin(); it != selected.end(); ++it)
 	{
-		if (hotlist.tqfind(*it) == hotlist.end())
+		if (hotlist.find(*it) == hotlist.end())
 		{
 			if (hotlist.size() >= hotlistNum)
 				hotlist.pop_front(); // stupid stl functions in TQt .. ;)

kiten/widgets.cpp

@@ -78,7 +78,7 @@ void ResultView::addResult(Dict::Entry result, bool common)
 	TQStringList Meanings = result.meanings();
 	for (it = Meanings.begin(); it != Meanings.end(); ++it)
 	{
-		if ((*it).tqfind("(P)") >= 0)
+		if ((*it).find("(P)") >= 0)
 		{
 			if (common)
 				continue;
@@ -357,9 +357,9 @@ void eEdit::openFile(const TQString &file)
 			continue;
 		Dict::Entry entry = Dict::parse(s);
 		TQString meanings = Dict::prettyMeaning(entry.meanings());
-		bool common = meanings.tqfind(TQString("(P)")) >= 0;
+		bool common = meanings.find(TQString("(P)")) >= 0;
-		meanings.tqreplace(TQRegExp("; "), "/");
+		meanings.replace(TQRegExp("; "), "/");
-		meanings.tqreplace(TQRegExp("/\\(P\\)"), "");
+		meanings.replace(TQRegExp("/\\(P\\)"), "");
 		new TQListViewItem(List, entry.kanji(), Dict::prettyKanjiReading(entry.readings()), meanings, common? i18n("yes") : i18n("no"));
 	}
 }

kiten/xjdic.h

@@ -58,8 +58,8 @@
 
 #define XJ_FIND         1	/* find entry				*/
 #define XJ_ENTRY        2	/* get this entry according to index	*/
-#define XJ_OK           3	/* tqfind/entry_get succeeded		*/
+#define XJ_OK           3	/* find/entry_get succeeded		*/
-#define XJ_NBG          4	/* tqfind/entry_get failed		*/
+#define XJ_NBG          4	/* find/entry_get failed		*/
 #define XJ_PROTERR      5	/* protocol error - server only		*/
 #define XJ_HULLO        6	/* just send back an XJ_OK and # dics   */
 #define XJ_GET          7	/* get this entry, wo checking any match*/

klatin/klatin/data/vocab/en/I2L.kvtml

@@ -35,7 +35,7 @@
  </e>
  <e>
   <o>invenio (3)</o>
-  <t>tqfind</t>
+  <t>find</t>
  </e>
  <e>
   <o>invito (1)</o>

klettres/klettres/klettres.cpp

@@ -93,12 +93,12 @@ void KLettres::findLanguages()
     for (TQStringList::Iterator it =mdirs.begin(); it !=mdirs.end(); ++it ) {
         TQDir dir(*it);
         m_languages += dir.entryList(TQDir::Dirs, TQDir::Name);
-        m_languages.remove(m_languages.tqfind("."));
+        m_languages.remove(m_languages.find("."));
-        m_languages.remove(m_languages.tqfind(".."));
+        m_languages.remove(m_languages.find(".."));
     }
-    m_languages.remove(m_languages.tqfind("pics"));
+    m_languages.remove(m_languages.find("pics"));
-    m_languages.remove(m_languages.tqfind("data"));
+    m_languages.remove(m_languages.find("data"));
-    m_languages.remove(m_languages.tqfind("icons"));
+    m_languages.remove(m_languages.find("icons"));
     m_languages.sort();
     if (m_languages.isEmpty()) return;
     Prefs::setLanguages(m_languages);
@@ -107,7 +107,7 @@ void KLettres::findLanguages()
     TQStringList temp_languages;
     for (uint i=0;  i<m_languages.count(); i++)
     {
-        if (m_languages.tqcontains(m_languages[i])>1) {
+        if (m_languages.contains(m_languages[i])>1) {
             temp_languages.append(m_languages[i]);
             m_languages.remove(m_languages[i]);
         }
@@ -155,8 +155,8 @@ TQString Prefs::defaultLanguage()
 	TQStringList defaultLanguages = KGlobal::locale()->languagesTwoAlpha();
 	if (!defaultLanguages.isEmpty()) {
 	//scan to see if defaultLanguages[0] belongs to m_languages. If not, en is default.
-	int i = Prefs::self()->m_languages.tqfindIndex(defaultLanguages[0]);
+	int i = Prefs::self()->m_languages.findIndex(defaultLanguages[0]);
-		if (Prefs::self()->m_languages.tqcontains(Prefs::language()))
+		if (Prefs::self()->m_languages.contains(Prefs::language()))
 			return Prefs::language(); //the last language played
 		else if (i<1)
 			return "en"; //if no other
@@ -284,7 +284,7 @@ void KLettres::loadSettings()
     //m_view->selectedLanguage = selectedLanguage;
     m_languageAction->setCurrentItem(Prefs::languageNumber());
     TQString langString = m_languageNames[Prefs::languageNumber()];
-    langString.tqreplace("&", TQString());
+    langString.replace("&", TQString());
     m_langLabel->setText(i18n("Current language is %1").tqarg(langString));
     loadLangToolBar();
     // load default level
@@ -368,7 +368,7 @@ void KLettres::slotChangeLanguage(int newLanguage)
     Prefs::writeConfig();
     // Update the StatusBar
     TQString langString = m_languageNames[newLanguage];
-    langString.tqreplace("&", TQString());
+    langString.replace("&", TQString());
     m_langLabel->setText(i18n("Current language is %1").tqarg(langString));
     loadLangToolBar();
     // Change language effectively

klettres/klettres/klnewstuff.cpp

@@ -49,8 +49,8 @@ bool KLNewStuff::install( const TQString &fileName )
     //refresh Languages menu
     //kdDebug() << "---- selected language : " << m_view->m_klettres->selectedLanguage << endl;
     m_view->m_klettres->m_languageAction->setItems(m_view->m_klettres->m_languageNames);
-    m_view->m_klettres->slotChangeLanguage(m_view->m_klettres->m_languages.tqfindIndex(Prefs::defaultLanguage()));
+    m_view->m_klettres->slotChangeLanguage(m_view->m_klettres->m_languages.findIndex(Prefs::defaultLanguage()));
-    m_view->m_klettres->m_languageAction->setCurrentItem(m_view->m_klettres->m_languages.tqfindIndex(Prefs::defaultLanguage()));
+    m_view->m_klettres->m_languageAction->setCurrentItem(m_view->m_klettres->m_languages.findIndex(Prefs::defaultLanguage()));
     return true;
 }
 

klettres/klettres/prefs_addons.h

@@ -33,13 +33,13 @@ static void setLanguageNumber(int i)
 
 static int languageNumber()
 {
-    int i = Prefs::self()->m_languages.tqfindIndex(language());
+    int i = Prefs::self()->m_languages.findIndex(language());
     if (i != -1)
         return i;
-    i = Prefs::self()->m_languages.tqfindIndex(defaultLanguage());
+    i = Prefs::self()->m_languages.findIndex(defaultLanguage());
     if (i != -1)
         return i;
-    i = Prefs::self()->m_languages.tqfindIndex("en");
+    i = Prefs::self()->m_languages.findIndex("en");
     if (i != -1)
         return i;
 

kmplot/TODO

@@ -5,7 +5,7 @@ TODO
 * Find bugs
 * More functions?
 * In tool menu:
-	* tqfind "nollställen" ( en: where the function's value is 0) 
+	* find "nollställen" ( en: where the function's value is 0) 
 	* get slope for a x-point
 	* Value table
 * Fix the unpolished lines?

kmplot/kmplot/MainDlg.cpp

@@ -526,7 +526,7 @@ void MainDlg::slotQuickEdit(const TQString& f_str_const )
 {
 	//creates a valid name for the function if the user has forgotten that
   	TQString f_str( f_str_const );
-	int const pos = f_str_const.tqfind(';');
+	int const pos = f_str_const.find(';');
 	if (pos!=-1)
 	  f_str = f_str.left(pos);
 	if (f_str.at(0)=='r')
@@ -538,7 +538,7 @@ void MainDlg::slotQuickEdit(const TQString& f_str_const )
 		KMessageBox::error( m_parent, i18n("Parametric functions must be definied in the \"New Parametric Plot\"-dialog which you can find in the menubar"));
 		return;
 	}
-	if  ( f_str.tqcontains('y') != 0)
+	if  ( f_str.contains('y') != 0)
 	{
 		KMessageBox::error( m_parent, i18n( "Recursive function is not allowed"));
 		m_quickEdit->setFocus();

kmplot/kmplot/View.cpp

@@ -531,7 +531,7 @@ void View::setpi(TQString *s)
 	int i;
 	TQChar c(960);
 
-	while((i=s->tqfind('p')) != -1) s->tqreplace(i, 2, &c, 1);
+	while((i=s->find('p')) != -1) s->replace(i, 2, &c, 1);
 }
 
 
@@ -639,7 +639,7 @@ void View::mouseMoveEvent(TQMouseEvent *e)
 		csflg=0;
 	}
 	
-	if(area.tqcontains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax))
+	if(area.contains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax))
 	{
 		TQPoint ptd, ptl;
 		TQPainter DC;
@@ -887,10 +887,10 @@ void View::mousePressEvent(TQMouseEvent *e)
 						it->setParameter( sw->slider->value() );
 				}
 
-				if ( function_type=='x' &&  fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.tqcontains('t')==1) //parametric plot
+				if ( function_type=='x' &&  fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.contains('t')==1) //parametric plot
 				{
 					TQValueVector<Ufkt>::iterator ufkt_y = it+1;
-					if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)<g)  && ufkt_y->fstr.tqcontains('t')==1)
+					if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)<g)  && ufkt_y->fstr.contains('t')==1)
 					{
 						if ( csmode == -1)
 						{
@@ -942,7 +942,7 @@ void View::mousePressEvent(TQMouseEvent *e)
 					else
 						m_popupmenushown = 2;
 					TQString function = it->fstr;
-					function = function.left(function.tqfind('(')) + '\'';
+					function = function.left(function.find('(')) + '\'';
 					m_popupmenu->changeTitle(10, function);
 					m_popupmenu->exec(TQCursor::pos());
 					return;
@@ -959,7 +959,7 @@ void View::mousePressEvent(TQMouseEvent *e)
 					else
 						m_popupmenushown = 2;
 					TQString function = it->fstr;
-					function = function.left(function.tqfind('(')) + "\'\'";
+					function = function.left(function.find('(')) + "\'\'";
 					m_popupmenu->changeTitle(10, function);
 					m_popupmenu->exec(TQCursor::pos());
 					return;
@@ -1019,7 +1019,7 @@ void View::mousePressEvent(TQMouseEvent *e)
 				csparam = k;
 				m_minmax->selectItem();
 				TQString function = it->fstr;
-				function = function.left(function.tqfind('(')) + '\'';
+				function = function.left(function.find('(')) + '\'';
 				setStatusBar(function,4);
 				mouseMoveEvent(e);
 				return;
@@ -1031,7 +1031,7 @@ void View::mousePressEvent(TQMouseEvent *e)
 				csparam = k;
 				m_minmax->selectItem();
 				TQString function = it->fstr;
-				function = function.left(function.tqfind('(')) + "\'\'";
+				function = function.left(function.find('(')) + "\'\'";
 				setStatusBar(function,4);
 				mouseMoveEvent(e);
 				return;
@@ -1561,14 +1561,14 @@ void View::keyPressEvent( TQKeyEvent * e)
 		case 1:
 			{
 				TQString function = it->fstr;
-				function = function.left(function.tqfind('(')) + '\'';
+				function = function.left(function.find('(')) + '\'';
 				setStatusBar(function,4);
 				break;
 			}
 		case 2:
 			{
 				TQString function = it->fstr;
-				function = function.left(function.tqfind('(')) + "\'\'";
+				function = function.left(function.find('(')) + "\'\'";
 				setStatusBar(function,4);
 				break;
 			}

kmplot/kmplot/editfunction.cpp

@@ -296,7 +296,7 @@ void EditFunction::accept()
 	tmp_ufkt.f2_linewidth = editderivativespage->lineWidthDerivative2->value();
 	tmp_ufkt.f2_color = editderivativespage->colorDerivative2->color().rgb();
 	
-	if ( f_str.tqcontains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) )
+	if ( f_str.contains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) )
 	{
 		KMessageBox::error( this, i18n( "Recursive function is only allowed when drawing integral graphs") );
 		return;
@@ -391,9 +391,9 @@ void EditFunction::slotHelp()
 
 bool EditFunction::functionHas2Arguments()
 {
-	int const openBracket = editfunctionpage->equation->text().tqfind( "(" );
+	int const openBracket = editfunctionpage->equation->text().find( "(" );
-	int const closeBracket = editfunctionpage->equation->text().tqfind( ")" );
+	int const closeBracket = editfunctionpage->equation->text().find( ")" );
-	return editfunctionpage->equation->text().mid( openBracket+1, closeBracket-openBracket-1 ).tqfind( "," ) != -1;
+	return editfunctionpage->equation->text().mid( openBracket+1, closeBracket-openBracket-1 ).find( "," ) != -1;
 }
 void EditFunction::cmdParameter_clicked()
 {
@@ -428,8 +428,8 @@ void EditFunction::customMaxRange_toggled(bool status)
 
 void EditFunction::fixFunctionArguments(TQString &f_str)
 {
-	int const openBracket = f_str.tqfind( "(" );
+	int const openBracket = f_str.find( "(" );
-	int const closeBracket = f_str.tqfind( ")" );
+	int const closeBracket = f_str.find( ")" );
 	char parameter_name;
 	if ( closeBracket-openBracket == 2) //the function atribute is only one character
 	{

kmplot/kmplot/kconstanteditor.cpp

@@ -89,7 +89,7 @@ void KConstantEditor::cmdDelete_clicked()
         for( TQValueVector<Ufkt>::iterator it =  m_view->parser()->ufkt.begin(); it !=  m_view->parser()->ufkt.end(); ++it)
 	{
 		str =  it->fstr;
-		for (int i=str.tqfind(')'); (uint)i<str.length();i++)
+		for (int i=str.find(')'); (uint)i<str.length();i++)
 			if ( str.at(i) == constant )
                         {
 			     KMessageBox::error(this, i18n("A function uses this constant; therefore, it cannot be removed."));
@@ -113,7 +113,7 @@ void KConstantEditor::cmdDelete_clicked()
 		}
 	}
 	
-	delete varlist->tqfindItem(TQChar(constant), 0); //removes the item from the constant list
+	delete varlist->findItem(TQChar(constant), 0); //removes the item from the constant list
 }
 
 void KConstantEditor::varlist_clicked( TQListViewItem * item )
@@ -191,7 +191,7 @@ void KConstantEditor::editConstantSlot()
 		return;
 	}
 
-	TQListViewItem *item = varlist->tqfindItem(TQChar(constant), 0);
+	TQListViewItem *item = varlist->findItem(TQChar(constant), 0);
 	if (item!=0)
 		item->setText(1,value);
 	
@@ -199,7 +199,7 @@ void KConstantEditor::editConstantSlot()
         int index = 0;
         for( TQValueVector<Ufkt>::iterator it =  m_view->parser()->ufkt.begin(); it !=  m_view->parser()->ufkt.end(); ++it)
 	{
-		if( it->fstr.tqcontains(constant)!=0 )
+		if( it->fstr.contains(constant)!=0 )
 			m_view->parser()->reparse(index); //reparsing the function
                 ++index;
 	}

kmplot/kmplot/keditparametric.cpp

@@ -103,7 +103,7 @@ void KEditParametric::setWidgets()
 
 void KEditParametric::accept()
 {
-	if  ( kLineEditXFunction->text().tqcontains('y') != 0 ||  kLineEditYFunction->text().tqcontains('y') != 0)
+	if  ( kLineEditXFunction->text().contains('y') != 0 ||  kLineEditYFunction->text().contains('y') != 0)
 	{
 		KMessageBox::error( this, i18n( "Recursive function not allowed"));
 		kLineEditXFunction->setFocus();
@@ -116,7 +116,7 @@ void KEditParametric::accept()
 	{
 		TQString fname;
 		m_parser->fixFunctionName(fname, XParser::ParametricX, m_x_id);
-		int const pos = fname.tqfind('(');
+		int const pos = fname.find('(');
 		kLineEditName->setText(fname.mid(1,pos-1));
 	}
 		
@@ -308,7 +308,7 @@ void KEditParametric::splitEquation( const TQString equation, TQString &name, TQ
 {
 	int start = 0;
 	if( equation[ 0 ] == 'x' || equation[ 0 ] == 'y' ) start++;
-	int length = equation.tqfind( '(' ) - start;
+	int length = equation.find( '(' ) - start;
 	name = equation.mid( start, length );
 	
 	expression = equation.section( '=', 1, 1 );

kmplot/kmplot/kminmax.cpp

@@ -148,7 +148,7 @@ void KMinMax::updateFunctions()
 			if ( it->f1_mode ) //1st derivative
 			{
 				TQString function (it->fstr);
-				int i= function.tqfind('(');
+				int i= function.find('(');
 				function.truncate(i);
 				function +="\'";
 				list->insertItem(function );
@@ -156,7 +156,7 @@ void KMinMax::updateFunctions()
 			if ( it->f2_mode )//2nd derivative
 			{
 				TQString function (it->fstr);
-				int i= function.tqfind('(');
+				int i= function.find('(');
 				function.truncate(i);
 				function +="\'\'";
 				list->insertItem(function );
@@ -164,7 +164,7 @@ void KMinMax::updateFunctions()
 			if ( it->integral_mode )//integral
 			{
 				TQString function (it->fstr);
-				int i= function.tqfind('(');
+				int i= function.find('(');
 				function.truncate(i);
 				function = function.upper();
 				list->insertItem(function );
@@ -177,7 +177,7 @@ void KMinMax::updateFunctions()
 	else
 		cmdFind->setEnabled(true);
 	selectItem();
-	TQListBoxItem *found_item = list->tqfindItem(selected_item,TQt::ExactMatch);
+	TQListBoxItem *found_item = list->findItem(selected_item,TQt::ExactMatch);
 	if ( found_item && m_view->csmode < 0)
 		list->setSelected(found_item,true);
 }
@@ -192,18 +192,18 @@ void KMinMax::selectItem()
 	TQString function = ufkt->fstr;
 	if ( m_view->cstype == 2)
 	{
-		int i= function.tqfind('(');
+		int i= function.find('(');
 		function.truncate(i);
 		function +="\'\'";
 	}
 	else if ( m_view->cstype == 1)
 	{
-		int i= function.tqfind('(');
+		int i= function.find('(');
 		function.truncate(i);
 		function +="\'";
 	}
 	//kdDebug() << "function: " << function << endl;
-	TQListBoxItem *item = list->tqfindItem(function,TQt::ExactMatch);
+	TQListBoxItem *item = list->findItem(function,TQt::ExactMatch);
 	list->setSelected(item,true);
 
 	if (  !ufkt->parameters.isEmpty() )
@@ -258,16 +258,16 @@ void KMinMax::cmdFind_clicked()
 
 	TQString function( list->currentText() );
 	char p_mode = 0;
-	if ( function.tqcontains('\'') == 1)
+	if ( function.contains('\'') == 1)
 	{
 		p_mode = 1;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,1);
 	}
-	else if ( function.tqcontains('\'') == 2)
+	else if ( function.contains('\'') == 2)
 	{
 		p_mode = 2;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,2);
 	}
 	else if ( function.at(0).category() == TQChar::Letter_Uppercase)
@@ -352,16 +352,16 @@ void KMinMax::list_highlighted(TQListBoxItem* item)
 	}
 	TQString function( list->currentText() );
 	char p_mode = 0;
-	if ( function.tqcontains('\'') == 1)
+	if ( function.contains('\'') == 1)
 	{
 		p_mode = 1;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,1);
 	}
-	else if ( function.tqcontains('\'') == 2)
+	else if ( function.contains('\'') == 2)
 	{
 		p_mode = 2;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,2);
 	}
 	else if ( function.at(0).category() == TQChar::Letter_Uppercase)
@@ -390,16 +390,16 @@ void KMinMax::cmdParameter_clicked()
 {
 	TQString function( list->currentText() );
 	char p_mode = 0;
-	if ( function.tqcontains('\'') == 1)
+	if ( function.contains('\'') == 1)
 	{
 		p_mode = 1;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,1);
 	}
-	else if ( function.tqcontains('\'') == 2)
+	else if ( function.contains('\'') == 2)
 	{
 		p_mode = 2;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,2);
 	}
 	else if ( function.at(0).category() == TQChar::Letter_Uppercase)

kmplot/kmplot/kminmax.h

@@ -49,7 +49,7 @@ public:
     ~KMinMax();
    
 public slots:
-    /// the user has pressen the tqfind/caluclate/draw button
+    /// the user has pressen the find/caluclate/draw button
     void cmdFind_clicked();
     /// the selecting a function that uses parameter function from a list the user can choose which paramater value he/she wants to use
     void cmdParameter_clicked();

kmplot/kmplot/kmplotio.cpp

@@ -435,7 +435,7 @@ void KmPlotIO::parseFunction( XParser *m_parser, const TQDomElement & n )
 	TQString fstr = ufkt.fstr;
 	if ( !fstr.isEmpty() )
 	{
-		int const i = fstr.tqfind( ';' );
+		int const i = fstr.find( ';' );
 		TQString str;
 		if ( i == -1 )
 			str = fstr;
@@ -530,7 +530,7 @@ void KmPlotIO::oldParseFunction(  XParser *m_parser, const TQDomElement & n )
 	}
 	
 	const TQString tmp_fstr = n.namedItem( "equation" ).toElement().text();
-	const int pos = tmp_fstr.tqfind(';');
+	const int pos = tmp_fstr.find(';');
 	if ( pos == -1 )
 	  ufkt.fstr = tmp_fstr;
 	else
@@ -546,7 +546,7 @@ void KmPlotIO::oldParseFunction(  XParser *m_parser, const TQDomElement & n )
 	TQString fstr = ufkt.fstr;
 	if ( !fstr.isEmpty() )
 	{
-		int const i = fstr.tqfind( ';' );
+		int const i = fstr.find( ';' );
 		TQString str;
 		if ( i == -1 )
 			str = fstr;

kmplot/kmplot/kparametereditor.cpp

@@ -289,7 +289,7 @@ void KParameterEditor::varlist_doubleClicked( TQListBoxItem * )
 
 bool KParameterEditor::checkTwoOfIt(const TQString & text)
 {
-	if ( list->tqfindItem(text,TQt::ExactMatch) == 0)
+	if ( list->findItem(text,TQt::ExactMatch) == 0)
 		return false;
 	else
 		return true;

kmplot/kmplot/parser.cpp

@@ -190,7 +190,7 @@ double Parser::eval(TQString str)
 	
 	fix_expression(str,0);
         
-	if ( str.tqcontains('y')!=0)
+	if ( str.contains('y')!=0)
 	{
 		err=9;
                 delete []stack;
@@ -347,9 +347,9 @@ int Parser::addfkt(TQString str)
 	stkptr=stack=0;
 	err=0;
 	errpos=1;
-	const int p1=str.tqfind('(');
+	const int p1=str.find('(');
-	int p2=str.tqfind(',');
+	int p2=str.find(',');
-	const int p3=str.tqfind(")=");
+	const int p3=str.find(")=");
         fix_expression(str,p1+4);
         
 	if(p1==-1 || p3==-1 || p1>p3)
@@ -435,9 +435,9 @@ void Parser::reparse(Ufkt *item)
 	err=0;
 	errpos=1;
 
-	const int p1=str.tqfind('(');
+	const int p1=str.find('(');
-	int p2=str.tqfind(',');
+	int p2=str.find(',');
-	const int p3=str.tqfind(")=");
+	const int p3=str.find(")=");
 	
         fix_expression(str,p1+4);
         
@@ -520,7 +520,7 @@ void Parser::fix_expression(TQString &str, int const pos)
                 }
         }
         TQString str_end = str.mid(pos);
-        str_end = str_end.tqreplace(m_decimalsymbol, "."); //replace the locale decimal symbol with a '.'
+        str_end = str_end.replace(m_decimalsymbol, "."); //replace the locale decimal symbol with a '.'
         str.truncate(pos);
         str.append(str_end);
         //kdDebug() << "str:" << str << endl;
@@ -1006,7 +1006,7 @@ int Parser::parserError(bool showMessageBox)
 TQString Parser::number( double value )
 {
        TQString str = TQString::number( value, 'g', 6 );
-       str.tqreplace( 'e', "*10^" );
+       str.replace( 'e', "*10^" );
 //     kDebug() << "returning str="<<str<<endl;
        return str;
 }

kmplot/kmplot/xparser.cpp

@@ -50,13 +50,13 @@ bool XParser::getext( Ufkt *item, const TQString fstr )
    	int p1, p2, p3, pe;
 	TQString tstr;
 	pe = fstr.length();
-	if ( fstr.tqfind( 'N' ) != -1 )
+	if ( fstr.find( 'N' ) != -1 )
 		item->f_mode = false;
 	else
 	{
-		if ( fstr.tqfind( "A1" ) != -1 )
+		if ( fstr.find( "A1" ) != -1 )
 			item->f1_mode = true;
-		if ( fstr.tqfind( "A2" ) != -1 )
+		if ( fstr.find( "A2" ) != -1 )
 			item->f2_mode = true;
 	}
 	switch ( fstr[0].latin1() )
@@ -67,13 +67,13 @@ bool XParser::getext( Ufkt *item, const TQString fstr )
 	    item->f1_mode = item->f2_mode = false;
 	}
 
-	p1 = fstr.tqfind( "D[" );
+	p1 = fstr.find( "D[" );
 	if ( p1 != -1 )
 	{
 		p1 += 2;
 		const TQString str = fstr.mid( p1, pe - p1);
-		p2 = str.tqfind(',');
+		p2 = str.find(',');
-		p3 = str.tqfind(']');
+		p3 = str.find(']');
 		if ( p2 > 0 && p2 < p3 )
 		{
 			tstr = str.left( p2 );
@@ -90,16 +90,16 @@ bool XParser::getext( Ufkt *item, const TQString fstr )
 		else
 			errflg = true;
 	}
-	p1 = fstr.tqfind( "P[" );
+	p1 = fstr.find( "P[" );
 	if ( p1 != -1 )
 	{
 		int i = 0;
 		p1 += 2;
 		TQString str = fstr.mid( p1, 1000);
-		p3 = str.tqfind( ']' );
+		p3 = str.find( ']' );
 		do
 		{
-			p2 = str.tqfind( ',' );
+			p2 = str.find( ',' );
 			if ( p2 == -1 || p2 > p3 )
 				p2 = p3;
 			tstr = str.left( p2++ );
@@ -179,8 +179,8 @@ void XParser::fixFunctionName( TQString &str, int const type, int const id)
     str.prepend( function_name );
   }
 
-  int p1=str.tqfind('(');
+  int p1=str.find('(');
-  int p2=str.tqfind(')');
+  int p2=str.find(')');
   if( p1>=0 && str.at(p2+1)=='=')
   {
     if ( type == XParser::Polar && str.at(0)!='r' )
@@ -641,14 +641,14 @@ bool XParser::functionRemoveParameter(const TQString &remove_parameter, uint id)
 int XParser::addFunction(const TQString &f_str)
 {
 	TQString added_function(f_str);
-	int const pos = added_function.tqfind(';');
+	int const pos = added_function.find(';');
 	if (pos!=-1)
 	  added_function = added_function.left(pos);
 	
 	fixFunctionName(added_function);
 	if ( added_function.at(0)== 'x' || added_function.at(0)== 'y') //TODO: Make it possible to define parametric functions
 		return -1;
-	if  ( added_function.tqcontains('y') != 0)
+	if  ( added_function.contains('y') != 0)
 		return -1;
 	int const id = addfkt( added_function );
 	if (id==-1)
@@ -745,7 +745,7 @@ bool XParser::setFunctionExpression(const TQString &f_str, uint id)
 		return false;
 	Ufkt *tmp_ufkt = &ufkt[ix];
 	TQString const old_fstr = tmp_ufkt->fstr;
-	TQString const fstr_begin = tmp_ufkt->fstr.left(tmp_ufkt->fstr.tqfind('=')+1);
+	TQString const fstr_begin = tmp_ufkt->fstr.left(tmp_ufkt->fstr.find('=')+1);
 	tmp_ufkt->fstr = fstr_begin+f_str;
 	reparse(tmp_ufkt);
 	if ( parserError(false) != 0)

kpercentage/kpercentage/kanimation.cpp

@@ -97,9 +97,9 @@ KStoryBoard::KStoryBoard( const TQString filename ) : TQDict<KScene>()
 		{
 			TQString s = t.readLine();       // line of text excluding '\n'
 			TQString dbgString = s;
-			int pos = s.tqfind ( "#");
+			int pos = s.find ( "#");
 			if (pos==-1)
-				pos = s.tqfind ( ";");
+				pos = s.find ( ";");
 			if ( pos > -1 )
 			{
 				dbgString = s.mid( pos +1 );
@@ -163,7 +163,7 @@ KStoryBoard::KStoryBoard( const TQString filename ) : TQDict<KScene>()
 			{
 				TQString scene_name;
 				current_scene->followingSceneName( scene_name );
-				current_scene = tqfind( scene_name );
+				current_scene = find( scene_name );
 				if ( current_scene )
 				{
 					current_scene->setToStart();
@@ -181,7 +181,7 @@ KStoryBoard::KStoryBoard( const TQString filename ) : TQDict<KScene>()
 
 	void KStoryBoard::setToStart()
 	{
-		current_scene = tqfind( "init" );
+		current_scene = find( "init" );
 		if ( current_scene )
 			current_scene->setToStart();
 	}

kstars/README.i18n

@@ -48,7 +48,7 @@ this document to answer some questions you might have.
   figure out the file format; briefly, it's a colon-delimited line
   with fields: object name, link text, link URL
 
-  Note that your alternate info_url.dat file will completely tqreplace 
+  Note that your alternate info_url.dat file will completely replace 
   the default, so if you want to include some links from the original,
   you will need to copy them over.  Some of the sites we link to provide
   versions of their pages in other languages (e.g., seds.org).  So

kstars/kstars/colorscheme.cpp

@@ -168,7 +168,7 @@ TQString ColorScheme::keyAt( int i ) const {
 }
 
 TQString ColorScheme::nameFromKey( const TQString &key ) const {
-	return nameAt( KeyName.tqfindIndex( key ) );
+	return nameAt( KeyName.findIndex( key ) );
 }
 
 void ColorScheme::setColor( const TQString &key, const TQString &color ) {
@@ -191,8 +191,8 @@ bool ColorScheme::load( const TQString &filename ) {
 	bool ok(false);
 	int newmode = line.left(1).toInt( &ok );
 	if ( ok ) setStarColorMode( newmode );
-	if ( line.tqcontains(':') ) {
+	if ( line.contains(':') ) {
-		int newintens = line.mid( line.tqfind(':')+1, 2 ).toInt( &ok );
+		int newintens = line.mid( line.find(':')+1, 2 ).toInt( &ok );
 		if ( ok ) setStarColorIntensity( newintens );
 	}
 
@@ -201,19 +201,19 @@ bool ColorScheme::load( const TQString &filename ) {
 	while ( !stream.eof() ) {
 		line = stream.readLine();
 
-		if ( line.tqcontains(':')==1 ) { //the new color preset format contains a ":" in each line, followed by the name of the color
+		if ( line.contains(':')==1 ) { //the new color preset format contains a ":" in each line, followed by the name of the color
       ++inew;
 			if ( iold ) return false; //we read at least one line without a colon...file is corrupted.
 
 //If this line has a valid Key, set the color.
-			TQString tkey = line.mid( line.tqfind(':')+1 ).stripWhiteSpace();
+			TQString tkey = line.mid( line.find(':')+1 ).stripWhiteSpace();
-			TQString tname = line.left( line.tqfind(':')-1 );
+			TQString tname = line.left( line.find(':')-1 );
 
-			if ( KeyName.tqcontains( tkey ) ) {
+			if ( KeyName.contains( tkey ) ) {
 				setColor( tkey, tname );
 			} else { //attempt to translate from old color ID
 				TQString k( line.mid( 5 ).stripWhiteSpace() + "Color" );
-				if ( KeyName.tqcontains( k ) ) {
+				if ( KeyName.contains( k ) ) {
 					setColor( k, tname );
 				} else {
 					kdWarning() << "Could not use the key \"" << tkey <<
@@ -248,7 +248,7 @@ bool ColorScheme::save( const TQString &name ) {
 	TQString filename = name.lower().stripWhiteSpace();
 	if ( !filename.isEmpty() ) {
 		for( unsigned int i=0; i<filename.length(); ++i)
-			if ( filename.at(i)==' ' ) filename.tqreplace( i, 1, "-" );
+			if ( filename.at(i)==' ' ) filename.replace( i, 1, "-" );
 
 		filename = filename.append( ".colors" );
 		file.setName( locateLocal( "appdata", filename ) ); //determine filename in local user KDE directory tree.
@@ -294,7 +294,7 @@ void ColorScheme::loadFromConfig( KConfig *conf ) {
 	TQStringList::Iterator it = KeyName.begin();
 	TQStringList::Iterator it_end = KeyName.end();
 	for ( ; it != it_end; ++it )
-		setColor( TQString(*it), conf->readEntry( TQString(*it), TQString( *Default.at( KeyName.tqfindIndex(*it) ) ) ) );
+		setColor( TQString(*it), conf->readEntry( TQString(*it), TQString( *Default.at( KeyName.findIndex(*it) ) ) ) );
 
 	setStarColorMode( conf->readNumEntry( "StarColorMode", 0 ) );
 	setStarColorIntensity( conf->readNumEntry( "StarColorIntensity", 5 ) );

kstars/kstars/deepskyobject.cpp

@@ -88,7 +88,7 @@ void DeepSkyObject::setCatalog( const TQString &cat ) {
 TQImage* DeepSkyObject::readImage( void ) {
 	TQFile file;
 	if ( Image==0 ) { //Image not currently set; try to load it from disk.
-		TQString fname = name().lower().tqreplace( TQRegExp(" "), "" ) + ".png";
+		TQString fname = name().lower().replace( TQRegExp(" "), "" ) + ".png";
 
 		if ( KSUtils::openDataFile( file, fname ) ) {
 			file.close();

kstars/kstars/detaildialog.cpp

@@ -313,7 +313,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo
 	//because we don't want a thousands-place separator!
 	TQString sEpoch = TQString::number( ut.epoch(), 'f', 1 );
 	//Replace the decimal point with localized decimal symbol
-	sEpoch.tqreplace( ".", KGlobal::locale()->decimalSymbol() );
+	sEpoch.replace( ".", KGlobal::locale()->decimalSymbol() );
 
 	Pos->RALabel->setText( i18n( "RA (%1):" ).tqarg( sEpoch ) );
 	Pos->DecLabel->setText( i18n( "Dec (%1):" ).tqarg( sEpoch ) );
@@ -706,9 +706,9 @@ bool DetailDialog::verifyUserData(int type)
 			for (i=0; i<dataList.count(); i++)
 			{
 				line = dataList[i];
-				name = line.mid( 0, line.tqfind(':') );
+				name = line.mid( 0, line.find(':') );
-				sub = line.mid( line.tqfind(':')+1 );
+				sub = line.mid( line.find(':')+1 );
-				title = sub.mid( 0, sub.tqfind(':') );
+				title = sub.mid( 0, sub.find(':') );
 				if (name == selectedObject->name() && title == currentItemTitle)
 				{
 					ObjectFound = true;
@@ -723,9 +723,9 @@ bool DetailDialog::verifyUserData(int type)
 			for (i=0; i<dataList.count(); i++)
 			{
 				line = dataList[i];
-				name = line.mid( 0, line.tqfind(':') );
+				name = line.mid( 0, line.find(':') );
-				sub = line.mid( line.tqfind(':')+1 );
+				sub = line.mid( line.find(':')+1 );
-				title = sub.mid( 0, sub.tqfind(':') );
+				title = sub.mid( 0, sub.find(':') );
 				if (name == selectedObject->name() && title == currentItemTitle)
 				{
 					ObjectFound = true;
@@ -845,13 +845,13 @@ TQString DetailDialog::parseADVData(TQString link)
 	TQString subLink;
 	int index;
 	
-	if ( (index = link.tqfind("KSOBJ")) != -1)
+	if ( (index = link.find("KSOBJ")) != -1)
 	{
 		link.remove(index, 5);
 		link = link.insert(index, selectedObject->name());
 	}
 
-	if ( (index = link.tqfind("KSRA")) != -1)
+	if ( (index = link.find("KSRA")) != -1)
 	{
 		link.remove(index, 4);
 		subLink = TQString().sprintf("%02d%02d%02d", selectedObject->ra0()->hour(), selectedObject->ra0()->minute(), selectedObject->ra0()->second());
@@ -860,7 +860,7 @@ TQString DetailDialog::parseADVData(TQString link)
 
 		link = link.insert(index, subLink);
 	}
-	if ( (index = link.tqfind("KSDEC")) != -1)
+	if ( (index = link.find("KSDEC")) != -1)
 	{
 		link.remove(index, 5);
 		if (selectedObject->dec()->degree() < 0)
@@ -906,7 +906,7 @@ void DetailDialog::centerTelescope()
   SkyPoint sp;
   
   // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element
-  // i.e. the first telescope we tqfind!
+  // i.e. the first telescope we find!
   
   INDIMenu *imenu = ksw->getINDIMenu();
 
@@ -1040,7 +1040,7 @@ void DetailDialog::showThumbnail() {
 	//If no image found, load "no image" image
 	//If that isn't found, make it blank.
 	TQFile file;
-	TQString fname = "thumb-" + selectedObject->name().lower().tqreplace( TQRegExp(" "), "" ) + ".png";
+	TQString fname = "thumb-" + selectedObject->name().lower().replace( TQRegExp(" "), "" ) + ".png";
 	if ( KSUtils::openDataFile( file, fname ) ) {
 		file.close();
 		Thumbnail->load( file.name(), "PNG" );
@@ -1060,7 +1060,7 @@ void DetailDialog::updateThumbnail() {
 	
 	if ( tp.exec() == TQDialog::Accepted ) {
 		TQString fname = locateLocal( "appdata", "thumb-" 
-				+ selectedObject->name().lower().tqreplace( TQRegExp(" "), "" ) + ".png" );
+				+ selectedObject->name().lower().replace( TQRegExp(" "), "" ) + ".png" );
 
 		Data->Image->setPixmap( *(tp.image()) );
 

kstars/kstars/dms.cpp

@@ -59,19 +59,19 @@ bool dms::setFromString( const TQString &str, bool isDeg ) {
 
 	//remove any instances of unit characters.
 	//h, d, m, s, ', ", or the degree symbol (ASCII 176)
-	entry.tqreplace( TQRegExp("h"), "" );
+	entry.replace( TQRegExp("h"), "" );
-	entry.tqreplace( TQRegExp("d"), "" );
+	entry.replace( TQRegExp("d"), "" );
-	entry.tqreplace( TQRegExp("m"), "" );
+	entry.replace( TQRegExp("m"), "" );
-	entry.tqreplace( TQRegExp("s"), "" );
+	entry.replace( TQRegExp("s"), "" );
 	TQString sdeg;
 	sdeg.sprintf("%c", 176);
-	entry.tqreplace( TQRegExp(sdeg), "" );
+	entry.replace( TQRegExp(sdeg), "" );
-	entry.tqreplace( TQRegExp("\'"), "" );
+	entry.replace( TQRegExp("\'"), "" );
-	entry.tqreplace( TQRegExp("\""), "" );
+	entry.replace( TQRegExp("\""), "" );
 
 	//Account for localized decimal-point settings
 	//TQString::toDouble() requires that the decimal symbol is "."
-	entry.tqreplace( KGlobal::locale()->decimalSymbol(), "." );
+	entry.replace( KGlobal::locale()->decimalSymbol(), "." );
  
 	//empty entry returns false
 	if ( entry.isEmpty() ) {
@@ -99,7 +99,7 @@ bool dms::setFromString( const TQString &str, bool isDeg ) {
 	TQStringList fields;
 
 	//check for colon-delimiters or space-delimiters
-	if ( entry.tqcontains(':') )
+	if ( entry.contains(':') )
 		fields = TQStringList::split( ':', entry );
 	else fields = TQStringList::split( " ", entry );
 

kstars/kstars/draglistbox.cpp

@@ -36,7 +36,7 @@ void DragListBox::dragEnterEvent( TQDragEnterEvent *evt )
 		evt->accept();
 }
 
-bool DragListBox::tqcontains( const TQString &s ) const {
+bool DragListBox::contains( const TQString &s ) const {
 	for ( uint i=0; i<count(); ++i )
 		if ( text(i) == s ) return true;
 

kstars/kstars/draglistbox.h

@@ -43,7 +43,7 @@ public:
 	~DragListBox();
 
 	int ignoreIndex() const { return IgnoreIndex; }
-	bool tqcontains( const TQString &s ) const;
+	bool contains( const TQString &s ) const;
 
 	void dragEnterEvent( TQDragEnterEvent *evt );
 	void dropEvent( TQDropEvent *evt );

kstars/kstars/filesource.cpp

@@ -27,7 +27,7 @@ FileSource::FileSource(KStarsData *ksdata, float magnitude)
 //	kdDebug() << "count()=" << data->starList.count() << endl;
 	fileNumber = ksdata->starList.count() / 1000 + 1;
 	lineNumber = ksdata->starList.count() % 1000;
-	// the first file tqcontains 12 comment lines at the beginning which must skipped
+	// the first file contains 12 comment lines at the beginning which must skipped
 	if (fileNumber == 1) { lineNumber += 12; }
 //	kdDebug() << "fileNumber=" << fileNumber << " lineNumber=" << lineNumber << endl;
 

kstars/kstars/finddialog.h

@@ -35,7 +35,7 @@ class TQListBoxItem;
 class SkyObjectNameListItem;
 
 /**@class FindDialog
-	*Dialog window for finding SkyObjects by name.  The dialog tqcontains
+	*Dialog window for finding SkyObjects by name.  The dialog contains
 	*a TQListBox showing the list of named objects, a TQLineEdit for filtering
 	*the list by name, and a TQCombobox for filtering the list by object type.
 	*

kstars/kstars/fitsimage.cpp

@@ -52,7 +52,7 @@
 /* Load info */
 typedef struct
 {
-  uint tqreplace;    /* replacement for blank/NaN-values */
+  uint replace;    /* replacement for blank/NaN-values */
   uint use_datamin;/* Use DATAMIN/MAX-scaling if possible */
   uint compose;    /* compose images with naxis==3 */
 } FITSLoadVals;
@@ -299,7 +299,7 @@ int FITSImage::loadFits (const char *filename)
  }
  trans.datamin = 0.0;
  trans.datamax = 255.0;
- trans.replacement = plvals.tqreplace;
+ trans.replacement = plvals.replace;
  trans.dsttyp = 'c';
  
  //displayImage->create(width, height, 32); 

kstars/kstars/fitsviewer.cpp

@@ -549,7 +549,7 @@ void FITSViewer::fileSave()
 	  currentURL = backupCurrent;
 	  return;
 	}
-	if (currentURL.path().tqcontains('.') == 0) currentURL.setPath(currentURL.path() + ".fits");
+	if (currentURL.path().contains('.') == 0) currentURL.setPath(currentURL.path() + ".fits");
 	
 	if (TQFile::exists(currentURL.path()))
         {
@@ -588,8 +588,8 @@ void FITSViewer::fileSave()
 	{
 	  recordList = record[j];
 	  
-	  if ( (index = recordList.tqfind("BITPIX")) != -1)
+	  if ( (index = recordList.find("BITPIX")) != -1)
-	  	recordList.tqreplace(index, FITS_CARD_SIZE, bitpixRec);
+	  	recordList.replace(index, FITS_CARD_SIZE, bitpixRec);
 	
 	  fwrite(recordList.ascii(), 1, FITS_RECORD_SIZE, ifp->fp);
         }
@@ -914,14 +914,14 @@ void FITSViewer::fitsHeader()
    	{
      	       property = recordList.left(FITS_CARD_SIZE);
 	       
-	       equal = property.tqfind('=');
+	       equal = property.find('=');
 	       
 	       if (equal == -1)
 	       {
-	        if (property.tqcontains(" ") != FITS_CARD_SIZE)
+	        if (property.contains(" ") != FITS_CARD_SIZE)
 	         	cards << property << "" << "";
 		 recordList.remove(0, FITS_CARD_SIZE);
-		 if (property.tqfind("END") != -1)
+		 if (property.find("END") != -1)
 		  break;
 		 else
 		  continue;
@@ -929,11 +929,11 @@ void FITSViewer::fitsHeader()
 	       
 	       
      	       cards << property.left(equal);
-     	       slash = property.tqfind("'");
+     	       slash = property.find("'");
      	       if (slash != -1)
-       		slash = property.tqfind("'", slash + 1) + 1;
+       		slash = property.find("'", slash + 1) + 1;
      	       else
-       		slash = property.tqfind('/') - 1;
+       		slash = property.find('/') - 1;
        
      		cards << property.mid(equal + 2, slash - (equal + 2)).simplifyWhiteSpace().remove("'");
      		cards << property.mid(slash + 1, FITS_CARD_SIZE - (slash + 1)).simplifyWhiteSpace();

kstars/kstars/fovdialog.cpp

@@ -171,7 +171,7 @@ void FOVDialog::slotEditFOV() {
 		FOV *newfov = new FOV( newfdlg.ui->FOVName->text(), newfdlg.ui->FOVEdit->text().toDouble(),
 				newfdlg.ui->ShapeBox->currentItem(), newfdlg.ui->ColorButton->color().name() );
 		fov->FOVListBox->changeItem( newfdlg.ui->FOVName->text(), fov->FOVListBox->currentItem() );
-		FOVList.tqreplace( fov->FOVListBox->currentItem(), newfov );
+		FOVList.replace( fov->FOVListBox->currentItem(), newfov );
 	}
 }
 

kstars/kstars/indi/LICENSE

@@ -135,7 +135,7 @@ included without limitation in the term "modification".)
 
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
-all the source code for all modules it tqcontains, plus any associated
+all the source code for all modules it contains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.
 

kstars/kstars/indi/fitsrw.c

@@ -1676,7 +1676,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix,
 {double offs, scale;
  double datadiff, pixdiff;
  unsigned char pixbuffer[4096], *pix, *cdata;
- unsigned char ctqreplace;
+ unsigned char creplace;
  int transcount = 0;
  long tdata, tmin, tmax;
  int maxelem;
@@ -1706,7 +1706,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix,
  if (tmax < 0) tmax = 0; else if (tmax > 255) tmax = 255;
 
  cdata = (unsigned char *)buf;
- ctqreplace = (unsigned char)trans->replacement;
+ creplace = (unsigned char)trans->replacement;
 
  switch (hdulist->bitpix)
  {
@@ -1727,7 +1727,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix,
          {
            bp8 = (FITS_BITPIX8)*(pix++);
            if (bp8 == bp8blank)      /* Is it a blank pixel ? */
-             *(cdata++) = ctqreplace;
+             *(cdata++) = creplace;
            else                      /* Do transform */
            {
              tdata = (long)(bp8 * scale + offs);
@@ -1770,7 +1770,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix,
          {
            FITS_GETBITPIX16 (pix, bp16);
            if (bp16 == bp16blank)
-             *(cdata++) = ctqreplace;
+             *(cdata++) = creplace;
            else
            {
              tdata = (long)(bp16 * scale + offs);
@@ -1815,7 +1815,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix,
          {
            FITS_GETBITPIX32 (pix, bp32);
            if (bp32 == bp32blank)
-             *(cdata++) = ctqreplace;
+             *(cdata++) = creplace;
            else
            {
              tdata = (long)(bp32 * scale + offs);
@@ -1856,7 +1856,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix,
        while (maxelem--)
        {
          if (fits_nan_32 (pix))    /* An IEEE special value ? */
-           *(cdata++) = ctqreplace;
+           *(cdata++) = creplace;
          else                      /* Do transform */
          {
            FITS_GETBITPIXM32 (pix, bpm32);
@@ -1884,7 +1884,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix,
        while (maxelem--)
        {
          if (fits_nan_64 (pix))
-           *(cdata++) = ctqreplace;
+           *(cdata++) = creplace;
          else
          {
            FITS_GETBITPIXM64 (pix, bpm64);

kstars/kstars/indi/indiserver.c

@@ -710,7 +710,7 @@ send2Clients (ClInfo *notme, XMLEle *root, char *dev)
 	pthread_mutex_unlock (&client_m);
 }
 
-/* free Msg mp and everything it tqcontains */
+/* free Msg mp and everything it contains */
 static void
 freeMsg (Msg *mp)
 {

kstars/kstars/indidevice.cpp

@@ -521,7 +521,7 @@ int INDI_D::processBlob(INDI_E *blobEL, XMLEle *ep, char errmsg[])
     return (-1);
   }
   
-  iscomp = (dataFormat.tqfind(".z") != -1);
+  iscomp = (dataFormat.find(".z") != -1);
   
   dataFormat.remove(".z");
   
@@ -679,7 +679,7 @@ INDI_G *  INDI_D::findGroup (TQString grouptag, int create, char errmsg[])
 }
 
 
-/* tqfind "perm" attribute in root, crack and set *pp.
+/* find "perm" attribute in root, crack and set *pp.
  * return 0 if ok else -1 with excuse in errmsg[]
  */
 

kstars/kstars/indidriver.cpp

@@ -146,7 +146,7 @@ for (uint i=0; i < ksw->data()->INDIHostsList.count(); i++)
   {
     if (devices[i]->mgrID == mgrID)
     {
-      affectedItem = localListView->tqfindItem(devices[i]->label, 0);
+      affectedItem = localListView->findItem(devices[i]->label, 0);
       if (!affectedItem) return;
       affectedItem->setPixmap(1, stopPix);
       affectedItem->setPixmap(2, NULL);
@@ -640,19 +640,19 @@ bool INDIDriver::buildDeviceGroup(XMLEle *root, char errmsg[])
 
   groupName = valuXMLAtt(ap);
   
-  if (groupName.tqfind("Telescopes") != -1)
+  if (groupName.find("Telescopes") != -1)
     groupType = KSTARS_TELESCOPE;
-  else if (groupName.tqfind("CCDs") != -1)
+  else if (groupName.find("CCDs") != -1)
     groupType = KSTARS_CCD;
-  else if (groupName.tqfind("Filter") != -1)
+  else if (groupName.find("Filter") != -1)
     groupType = KSTARS_FILTER;
-  else if (groupName.tqfind("Video") != -1)
+  else if (groupName.find("Video") != -1)
     groupType = KSTARS_VIDEO;
-  else if (groupName.tqfind("Focusers") != -1)
+  else if (groupName.find("Focusers") != -1)
     groupType = KSTARS_FOCUSER;
-  else if (groupName.tqfind("Domes") != -1)
+  else if (groupName.find("Domes") != -1)
     groupType = KSTARS_DOME;
-  else if (groupName.tqfind("GPS") != -1)
+  else if (groupName.find("GPS") != -1)
     groupType = KSTARS_GPS;
 
 
@@ -829,7 +829,7 @@ void INDIDriver::modifyINDIHost()
     	currentItem->setText(1, hostConf.nameIN->text());
     	currentItem->setText(2, hostConf.portnumber->text());
 
-    	ksw->data()->INDIHostsList.tqreplace(clientListView->itemIndex(currentItem), hostItem);
+    	ksw->data()->INDIHostsList.replace(clientListView->itemIndex(currentItem), hostItem);
 
     	saveHosts();
   	}

kstars/kstars/indielement.cpp

@@ -37,7 +37,7 @@
 #include <kdialogbase.h>
 
 /* search element for attribute.
- * return XMLAtt if tqfind, else NULL with helpful info in errmsg.
+ * return XMLAtt if find, else NULL with helpful info in errmsg.
  */
 XMLAtt * findAtt (XMLEle *ep, const char *name, char errmsg[])
 {
@@ -50,7 +50,7 @@ XMLAtt * findAtt (XMLEle *ep, const char *name, char errmsg[])
 }
 
 /* search element for given child. pp is just to build a better errmsg.
- * return XMLEle if tqfind, else NULL with helpful info in errmsg.
+ * return XMLEle if find, else NULL with helpful info in errmsg.
  */
 XMLEle * findEle (XMLEle *ep, INDI_P *pp, const char *child, char errmsg[])
 {

kstars/kstars/indimenu.cpp

@@ -222,7 +222,7 @@ void INDIMenu::setCustomLabel(TQString deviceName)
 
 for (unsigned int i=0; i < mgr.count(); i++)
    for (unsigned int j=0; j < mgr.at(i)->indi_dev.count(); j++)
-         if (mgr.at(i)->indi_dev.at(j)->label.tqfind(deviceName) >= 0)
+         if (mgr.at(i)->indi_dev.at(j)->label.find(deviceName) >= 0)
 	 	nset++;
 
 if (nset)

kstars/kstars/indiproperty.cpp

@@ -209,18 +209,18 @@ void INDI_P::convertSwitch(int id)
  if (assosiatedPopup == NULL)
   return;
 
-  mLabel = assosiatedPopup->text(id).tqreplace("&", "");
+  mLabel = assosiatedPopup->text(id).replace("&", "");
 
   //kdDebug() << "Name: " << name << " ID: " << id << endl;
  /* Special case is CCD_EXPOSE_DURATION, not a switch */
- if (stdID == CCD_EXPOSE_DURATION && mLabel.tqfind(label) != -1)
+ if (stdID == CCD_EXPOSE_DURATION && mLabel.find(label) != -1)
  {
    newText();
    return;
  }
 
  /* Another special case, center telescope */
- if (mLabel.tqfind("Crosshair") != -1)
+ if (mLabel.find("Crosshair") != -1)
  {
         if (!indistd->stdDev->dp->isOn()) return;
 	if (indistd->stdDev->telescopeSkyObject == NULL) return;
@@ -339,7 +339,7 @@ void INDI_P::newBlob()
      
       fp.setName(filename);
 
-      if ( (pos = filename.tqfindRev(".")) != -1)
+      if ( (pos = filename.findRev(".")) != -1)
 		format = filename.mid (pos, filename.length());
 
       if (!fp.open(IO_ReadOnly))

kstars/kstars/indistd.cpp

@@ -472,7 +472,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d
        tempName = it.current()->name();
        
        // find the prefix first
-       if (tempName.tqfind(seqPrefix) == -1)
+       if (tempName.find(seqPrefix) == -1)
          continue;
 	 
        strncpy(tempPrefix, tempName.ascii(), 64);

kstars/kstars/infoboxes.cpp

@@ -126,17 +126,17 @@ void InfoBoxes::drawBoxes( TQPainter &p, TQColor FGColor, TQColor grabColor,
 }
 
 bool InfoBoxes::grabBox( TQMouseEvent *e ) {
-	if ( GeoBox->rect().tqcontains( e->pos() ) ) {
+	if ( GeoBox->rect().contains( e->pos() ) ) {
 		GrabbedBox = 1;
 		GrabPos.setX( e->x() - GeoBox->x() );
 		GrabPos.setY( e->y() - GeoBox->y() );
 		return true;
-	} else if ( TimeBox->rect().tqcontains( e->pos() ) ) {
+	} else if ( TimeBox->rect().contains( e->pos() ) ) {
 		GrabbedBox = 2;
 		GrabPos.setX( e->x() - TimeBox->x() );
 		GrabPos.setY( e->y() - TimeBox->y() );
 		return true;
-	} else if ( FocusBox->rect().tqcontains( e->pos() ) ) {
+	} else if ( FocusBox->rect().contains( e->pos() ) ) {
 		GrabbedBox = 3;
 		GrabPos.setX( e->x() - FocusBox->x() );
 		GrabPos.setY( e->y() - FocusBox->y() );
@@ -180,7 +180,7 @@ bool InfoBoxes::dragBox( TQMouseEvent *e ) {
 }
 
 bool InfoBoxes::shadeBox( TQMouseEvent *e ) {
-	if ( GeoBox->rect().tqcontains( e->pos() ) ) {
+	if ( GeoBox->rect().contains( e->pos() ) ) {
 		GeoBox->toggleShade();
 		if ( GeoBox->rect().bottom() > height() ) GeoBox->move( GeoBox->x(), height() - GeoBox->height() );
 		if ( GeoBox->rect().right() > width() ) GeoBox->move( width() - GeoBox->width(), GeoBox->y() );
@@ -189,7 +189,7 @@ bool InfoBoxes::shadeBox( TQMouseEvent *e ) {
 		fixCollisions( TimeBox );
 		fixCollisions( FocusBox );
 		return true;
-	} else if ( TimeBox->rect().tqcontains( e->pos() ) ) {
+	} else if ( TimeBox->rect().contains( e->pos() ) ) {
 		TimeBox->toggleShade();
 		if ( TimeBox->rect().bottom() > height() ) TimeBox->move( TimeBox->x(), height() - TimeBox->height() );
 		if ( TimeBox->rect().right() > width() ) TimeBox->move( width() - TimeBox->width(), TimeBox->y() );
@@ -198,7 +198,7 @@ bool InfoBoxes::shadeBox( TQMouseEvent *e ) {
 		fixCollisions( GeoBox );
 		fixCollisions( FocusBox );
 		return true;
-	} else if ( FocusBox->rect().tqcontains( e->pos() ) ) {
+	} else if ( FocusBox->rect().contains( e->pos() ) ) {
 		FocusBox->toggleShade();
 		if ( FocusBox->rect().bottom() > height() ) FocusBox->move( FocusBox->x(), height() - FocusBox->height() );
 		if ( FocusBox->rect().right() > width() ) FocusBox->move( width() - FocusBox->width(), FocusBox->y() );
@@ -248,7 +248,7 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) {
 	if ( Box2.width() ) Box2.setCoords( Box2.left()+1, Box2.top()+1, Box2.right()-1, Box2.bottom()-1 );
 
 //First, make sure target box is within area rect.
-	if ( ! area.tqcontains( t ) ) {
+	if ( ! area.contains( t ) ) {
 /*		if ( t.x() < area.x() ) target->move( area.x(), t.y() );
 		if ( t.y() < area.y() ) target->move( t.x(), area.y() );
 		if ( t.right() > area.right() ){ target->move( area.right() - t.width(), t.y() ); }
@@ -280,25 +280,25 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) {
 			leftRect.moveTopLeft( TQPoint( t.x() - dLeft, t.y() ) );
 		}
 		//If leftRect is outside area, set dLeft to a nonsense large value
-		if ( !area.tqcontains( leftRect ) ) { dLeft = 100000; }
+		if ( !area.contains( leftRect ) ) { dLeft = 100000; }
 		//repeat for right, up and down directions.
 		while ( rightRect.intersects( Box1 ) || rightRect.intersects( Box2 ) ) {
 			++dRight;
 			rightRect.moveTopLeft( TQPoint( t.x() + dRight, t.y() ) );
 		}
-		if ( !area.tqcontains( rightRect ) ) { dRight = 100000; }
+		if ( !area.contains( rightRect ) ) { dRight = 100000; }
 
 		while ( upRect.intersects( Box1 ) || upRect.intersects( Box2 ) ) {
 			++dUp;
 			upRect.moveTopLeft( TQPoint( t.x(), t.y() - dUp ) );
 		}
-		if ( !area.tqcontains( upRect ) ) { dUp = 100000; }
+		if ( !area.contains( upRect ) ) { dUp = 100000; }
 
 		while ( downRect.intersects( Box1 ) || downRect.intersects( Box2 ) ) {
 			++dDown;
 			downRect.moveTopLeft( TQPoint( t.x(), t.y() + dDown ) );
 		}
-		if ( !area.tqcontains( downRect ) ) { dDown = 100000; }
+		if ( !area.contains( downRect ) ) { dDown = 100000; }
 
 
 		//find the smallest displacement, and move the target box there.
@@ -331,7 +331,7 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) {
 
 	//Final check to see if we're still inside area (we may not be if target
 	//is bigger than area)
-	if ( area.tqcontains( target->rect() ) ) return true;
+	if ( area.contains( target->rect() ) ) return true;
 	else return false;
 }
 
@@ -351,7 +351,7 @@ bool InfoBoxes::timeChanged( const KStarsDateTime &ut, const KStarsDateTime &lt,
 	//Don't use KLocale::formatNumber() for Julian Day because we don't want 
 	//thousands-place separators
 	TQString JDString = TQString::number( ut.djd(), 'f', 2 );
-	JDString.tqreplace( ".", KGlobal::locale()->decimalSymbol() );
+	JDString.replace( ".", KGlobal::locale()->decimalSymbol() );
 	
 	TimeBox->setText3( i18n( "Sidereal Time", "ST: " ) + STString +
 			i18n( "Julian Day", "JD: " ) + JDString );

kstars/kstars/kscomet.cpp

@@ -49,9 +49,9 @@ KSComet::KSComet( KStarsData *_kd, TQString _s, TQString imfile,
 	P = 365.2568984 * pow(a, 1.5); //period in days
 
 	//If the name contains a "/", make this name2 and make name a truncated version without the leading "P/" or "C/"
-	if ( name().tqcontains( "/" ) ) {
+	if ( name().contains( "/" ) ) {
 		setLongName( name() );
-		setName( name().mid( name().tqfind("/") + 1 ) );
+		setName( name().mid( name().find("/") + 1 ) );
 	}
 }
 

kstars/kstars/ksnewstuff.cpp

@@ -79,7 +79,7 @@ void KSNewStuff::updateData( const TQString &path ) {
 	
 	
 	//Handle the Steinicke NGC/IC catalog
-	if ( !NGCUpdated && qd[0].tqcontains( "ngcic" ) ) {
+	if ( !NGCUpdated && qd[0].contains( "ngcic" ) ) {
 		//Build a progress dialog to show during data installation.
 		KProgressDialog prog( 0, "newstuffprogdialog", 
 				i18n( "Please Wait" ), i18n( "Installing Steinicke NGC/IC catalog..." ), false /*modal*/ );

kstars/kstars/kspopupmenu.cpp

@@ -320,7 +320,7 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr
 	}
 
 	if ( showObsList && obj ) {
-		if ( ksw->observingList()->tqcontains( obj ) )
+		if ( ksw->observingList()->contains( obj ) )
 			insertItem( i18n("Remove From List"), ksw->observingList(), TQT_SLOT( slotRemoveObject() ) );
 		else 
 			insertItem( i18n("Add to List"), ksw->observingList(), TQT_SLOT( slotAddObject() ) );

kstars/kstars/kstarsactions.cpp

@@ -535,7 +535,7 @@ void KStars::slotRunScript() {
 
 		// Before we run the script, make sure that it's safe.  Each line must either begin with "#"
 		// or begin with "dcop $KSTARS".  Otherwise, the line must be equal to one of the following:
-		// "KSTARS=`dcoptqfind -a 'kstars*'`";  "MAIN=KStarsInterface";  or "CLOCK=clock#1"
+		// "KSTARS=`dcopfind -a 'kstars*'`";  "MAIN=KStarsInterface";  or "CLOCK=clock#1"
 		TQTextStream istream(&f);
 		TQString line;
 		bool fileOK( true );
@@ -543,7 +543,7 @@ void KStars::slotRunScript() {
 		while (  ! istream.eof() ) {
 			line = istream.readLine();
 			if ( line.left(1) != "#" && line.left(12) != "dcop $KSTARS"
-					&& line.stripWhiteSpace() != "KSTARS=`dcoptqfind -a 'kstars*'`"
+					&& line.stripWhiteSpace() != "KSTARS=`dcopfind -a 'kstars*'`"
 					&& line.stripWhiteSpace() != "MAIN=KStarsInterface"
 					&& line.stripWhiteSpace() != "CLOCK=clock#1" ) {
 				fileOK = false;

kstars/kstars/kstarsdata.cpp

@@ -226,17 +226,17 @@ bool KStarsData::readADVTreeData(void)
 
     else
     {
-      Name = Line.mid(0, Line.tqfind(":"));
+      Name = Line.mid(0, Line.find(":"));
-      Link = Line.mid(Line.tqfind(":") + 1);
+      Link = Line.mid(Line.find(":") + 1);
 
       // Link is empty, using Interface instead
       if (Link.isEmpty())
       {
          Link = Interface;
          subName = Name;
-         interfaceIndex = Link.tqfind("KSINTERFACE");
+         interfaceIndex = Link.find("KSINTERFACE");
          Link.remove(interfaceIndex, 11);
-         Link = Link.insert(interfaceIndex, subName.tqreplace( TQRegExp(" "), "+"));
+         Link = Link.insert(interfaceIndex, subName.replace( TQRegExp(" "), "+"));
 
        }
 
@@ -664,9 +664,9 @@ void KStarsData::processStar( TQString *line, bool reloadMode ) {
 
 	//parse name(s)
 	name = line->mid( 72 ).stripWhiteSpace(); //the rest of the line
-	if (name.tqcontains( ':' )) { //genetive form exists
+	if (name.contains( ':' )) { //genetive form exists
-		gname = name.mid( name.tqfind(':')+1 ).stripWhiteSpace();
+		gname = name.mid( name.find(':')+1 ).stripWhiteSpace();
-		name = name.mid( 0, name.tqfind(':') ).stripWhiteSpace();
+		name = name.mid( 0, name.find(':') ).stripWhiteSpace();
 	}
 
 	// HEV: look up star name in internationalization filesource
@@ -964,14 +964,14 @@ bool KStarsData::openURLFile(TQString urlfile, TQFile & file) {
 								TQString line = gStream.readLine();
 
 								//If global-file line begins with "XXX:" then this line should be removed from the local file.
-								if ( line.left( 4 ) == "XXX:"  && urlData.tqcontains( line.mid( 4 ) ) ) {
+								if ( line.left( 4 ) == "XXX:"  && urlData.contains( line.mid( 4 ) ) ) {
-									urlData.remove( urlData.tqfind( line.mid( 4 ) ) );
+									urlData.remove( urlData.find( line.mid( 4 ) ) );
 								} else {
 									//does local file contain the current global file line, up to second ':' ?
 
 									bool linefound( false );
 									for ( unsigned int j=0; j< urlData.count(); ++j ) {
-										if ( urlData[j].tqcontains( line.left( line.tqfind( ':', line.tqfind( ':' ) + 1 ) ) ) ) {
+										if ( urlData[j].contains( line.left( line.find( ':', line.find( ':' ) + 1 ) ) ) ) {
 											//replace line in urlData with its equivalent in the newer global file.
 											urlData.remove( urlData.at(j) );
 											urlData.insert( urlData.at(j), line );
@@ -1047,21 +1047,21 @@ bool KStarsData::readUserLog(void)
 	while (!buffer.isEmpty()) {
 		int startIndex, endIndex;
 
-		startIndex = buffer.tqfind("[KSLABEL:");
+		startIndex = buffer.find("[KSLABEL:");
 		sub = buffer.mid(startIndex);
-		endIndex = sub.tqfind("[KSLogEnd]");
+		endIndex = sub.find("[KSLogEnd]");
 
 		// Read name after KSLABEL identifer
-		uint uiFirstNewline = sub.tqfind("\n", startIndex + 9);
+		uint uiFirstNewline = sub.find("\n", startIndex + 9);
-		name = sub.mid(startIndex + 9, sub.tqfindRev( "]", uiFirstNewline ) - (startIndex + 9) );
+		name = sub.mid(startIndex + 9, sub.findRev( "]", uiFirstNewline ) - (startIndex + 9) );
 		// Read data and skip new line
 		data   = sub.mid( uiFirstNewline + 1, endIndex - (uiFirstNewline + 1));
 		buffer = buffer.mid(endIndex + 11);
 
 		//Find the sky object named 'name'.
-		//Note that ObjectNameList::tqfind() looks for the ascii representation 
+		//Note that ObjectNameList::find() looks for the ascii representation 
 		//of star genetive names, so stars are identified that way in the user log.
-		SkyObjectName *sonm = ObjNames.tqfind(name);
+		SkyObjectName *sonm = ObjNames.find(name);
 		if (sonm == 0) {
 			kdWarning() << k_funcinfo << name << " not found" << endl;
 		} else {
@@ -1084,12 +1084,12 @@ bool KStarsData::readURLData( TQString urlfile, int type, bool deepOnly ) {
 
 		//ignore comment lines
 		if ( line.left(1) != "#" ) {
-			TQString name = line.mid( 0, line.tqfind(':') );
+			TQString name = line.mid( 0, line.find(':') );
-			TQString sub = line.mid( line.tqfind(':')+1 );
+			TQString sub = line.mid( line.find(':')+1 );
-			TQString title = sub.mid( 0, sub.tqfind(':') );
+			TQString title = sub.mid( 0, sub.find(':') );
-			TQString url = sub.mid( sub.tqfind(':')+1 );
+			TQString url = sub.mid( sub.find(':')+1 );
 	
-			SkyObjectName *sonm = ObjNames.tqfind(name);
+			SkyObjectName *sonm = ObjNames.find(name);
 			
 			if (sonm == 0) {
 				kdWarning() << k_funcinfo << name << " not found" << endl;
@@ -1196,7 +1196,7 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs
 				//Now, if one of the columns is the "Name" field, the name may contain spaces.
 				//In this case, the name field will need to be surrounded by quotes.  
 				//Check for this, and adjust the d list accordingly
-				int iname = Columns.tqfindIndex( "Nm" );
+				int iname = Columns.findIndex( "Nm" );
 				if ( iname >= 0 && d[iname].left(1) == "\"" ) { //multi-word name in quotes
 					d[iname] = d[iname].mid(1); //remove leading quote
 					//It's possible that the name is one word, but still in quotes
@@ -1388,13 +1388,13 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
 		TQString d( *it ); //current data line
 		if ( d.left(1) != "#" ) break;  //no longer in header!
 
-		int iname   = d.tqfind( "# Name: " );
+		int iname   = d.find( "# Name: " );
-		int iprefix = d.tqfind( "# Prefix: " );
+		int iprefix = d.find( "# Prefix: " );
-		int icolor  = d.tqfind( "# Color: " );
+		int icolor  = d.find( "# Color: " );
-		int iepoch  = d.tqfind( "# Epoch: " );
+		int iepoch  = d.find( "# Epoch: " );
 
 		if ( iname == 0 ) { //line contains catalog name
-			iname = d.tqfind(":")+2;
+			iname = d.find(":")+2;
 			if ( CatalogName.isEmpty() ) { 
 				CatalogName = d.mid( iname );
 			} else { //duplicate name in header
@@ -1403,7 +1403,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
 							i18n( "Extra Name field in header: %1.  Will be ignored" ).tqarg( d.mid(iname) ) );
 			}
 		} else if ( iprefix == 0 ) { //line contains catalog prefix
-			iprefix = d.tqfind(":")+2;
+			iprefix = d.find(":")+2;
 			if ( CatalogPrefix.isEmpty() ) { 
 				CatalogPrefix = d.mid( iprefix );
 			} else { //duplicate prefix in header
@@ -1412,7 +1412,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
 							i18n( "Extra Prefix field in header: %1.  Will be ignored" ).tqarg( d.mid(iprefix) ) );
 			}
 		} else if ( icolor == 0 ) { //line contains catalog prefix
-			icolor = d.tqfind(":")+2;
+			icolor = d.find(":")+2;
 			if ( CatalogColor.isEmpty() ) { 
 				CatalogColor = d.mid( icolor );
 			} else { //duplicate prefix in header
@@ -1421,7 +1421,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
 							i18n( "Extra Color field in header: %1.  Will be ignored" ).tqarg( d.mid(icolor) ) );
 			}
 		} else if ( iepoch == 0 ) { //line contains catalog epoch
-			iepoch = d.tqfind(":")+2;
+			iepoch = d.find(":")+2;
 			if ( CatalogEpoch == 0. ) {
 				bool ok( false );
 				CatalogEpoch = d.mid( iepoch ).toFloat( &ok );
@@ -1438,7 +1438,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
 			}
 		} else if ( ! foundDataColumns ) { //don't try to parse data column descriptors if we already found them
 			//Chomp off leading "#" character
-			d = d.tqreplace( TQRegExp( "#" ), "" );
+			d = d.replace( TQRegExp( "#" ), "" );
 
 			TQStringList fields = TQStringList::split( " ", d ); //split on whitespace
 
@@ -1452,17 +1452,17 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
 
 			for ( ; itf != itfEnd; itf++ ) {
 				TQString s( *itf );
-				if ( master.tqcontains( s ) ) {
+				if ( master.contains( s ) ) {
 					//add the data field
 					Columns.append( s );
 
 					// remove the field from the master list and inc the 
 					// count of "good" columns (unless field is "Ignore")
 					if ( s != "Ig" ) {
-						master.remove( master.tqfind( s ) );
+						master.remove( master.find( s ) );
 						ncol++;
 					}
-				} else if ( fields.tqcontains( s ) ) { //duplicate field
+				} else if ( fields.contains( s ) ) { //duplicate field
 					fields.append( "Ig" ); //skip this column
 					if ( showerrs )
 						errs.append( i18n( "Parsing header: " ) + 
@@ -1514,7 +1514,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
 		}
 
 		//the it iterator now points to the first line past the header
-		iStart = lines.tqfindIndex( TQString( *it ) );
+		iStart = lines.findIndex( TQString( *it ) );
 		return true;
 	}
 }
@@ -1646,10 +1646,10 @@ bool KStarsData::readTimeZoneRulebook( void ) {
 			if ( line.left(1) != "#" && line.length() ) { //ignore commented and blank lines
 				TQStringList fields = TQStringList::split( " ", line );
 				id = fields[0];
-				TQTime stime = TQTime( fields[3].left( fields[3].tqfind(':')).toInt() ,
+				TQTime stime = TQTime( fields[3].left( fields[3].find(':')).toInt() ,
-								fields[3].mid( fields[3].tqfind(':')+1, fields[3].length()).toInt() );
+								fields[3].mid( fields[3].find(':')+1, fields[3].length()).toInt() );
-				TQTime rtime = TQTime( fields[6].left( fields[6].tqfind(':')).toInt(),
+				TQTime rtime = TQTime( fields[6].left( fields[6].find(':')).toInt(),
-								fields[6].mid( fields[6].tqfind(':')+1, fields[6].length()).toInt() );
+								fields[6].mid( fields[6].find(':')+1, fields[6].length()).toInt() );
 
 				Rulebook[ id ] = TimeZoneRule( fields[1], fields[2], stime, fields[4], fields[5], rtime );
 			}
@@ -2236,7 +2236,7 @@ void KStarsData::setFullTimeUpdate() {
 }
 
 void KStarsData::setLocationFromOptions() {
-	TQMap<TQString, TimeZoneRule>::Iterator it = Rulebook.tqfind( Options::dST() );
+	TQMap<TQString, TimeZoneRule>::Iterator it = Rulebook.find( Options::dST() );
 	setLocation( GeoLocation ( Options::longitude(), Options::latitude(), 
 			Options::cityName(), Options::provinceName(), Options::countryName(), 
 			Options::timeZone(), &(it.data()), 4, Options::elevation() ) );

kstars/kstars/kstarsdata.h

@@ -135,7 +135,7 @@ public:
 		*/
 	bool readTimeZoneRulebook( void );
 
-	/**Parse one line from a locations database file.  The line tqcontains 10 or 11 fields
+	/**Parse one line from a locations database file.  The line contains 10 or 11 fields
 		*separated by colons (":").  The fields are:
 		*@li City Name [string]
 		*@li Province Name (optional) [string]
@@ -352,7 +352,7 @@ public:
 	/**Read in URLs to be attached to a named object's right-click popup menu.  At this
 		*point, there is no way to attach URLs to unnamed objects.  There are two
 		*kinds of URLs, each with its own data file: image links and webpage links.  In addition,
-		*there may be user-specific versions with custom URLs.  Each line tqcontains 3 fields
+		*there may be user-specific versions with custom URLs.  Each line contains 3 fields
 		*separated by colons (":").  Note that the last field is the URL, and as such it will
 		*generally contain a colon itself.  Only the first two colons encountered are treated
 		*as field separators.  The fields are:
@@ -450,7 +450,7 @@ public:
 	KSPlanet *earth() { return PCat->earth(); }
 
 	/**@short Find object by name.
-		*@param name Object name to tqfind
+		*@param name Object name to find
 		*@return pointer to SkyObject matching this name
 		*/
 	SkyObject* objectNamed( const TQString &name );

kstars/kstars/kstarsdcop.cpp

@@ -359,7 +359,7 @@ void KStars::loadColorScheme( const TQString _name ) {
 	if ( ! ok ) {
 		if ( !filename.isEmpty() ) {
 			for( unsigned int i=0; i<filename.length(); ++i)
-				if ( filename.at(i)==' ' ) filename.tqreplace( i, 1, "-" );
+				if ( filename.at(i)==' ' ) filename.replace( i, 1, "-" );
 			
 			filename = filename.append( ".colors" );
 			ok = data()->colorScheme()->load( filename );
@@ -392,7 +392,7 @@ void KStars::exportImage( const TQString url, int w, int h ) {
 	//If the filename string contains no "/" separators, assume the 
 	//user wanted to place a file in their home directory.
 	KURL fileURL;
-	if ( ! url.tqcontains( "/" ) ) fileURL = TQDir::homeDirPath() + "/" + url;
+	if ( ! url.contains( "/" ) ) fileURL = TQDir::homeDirPath() + "/" + url;
 	else fileURL = url;
 
 	KTempFile tmpfile;
@@ -411,7 +411,7 @@ void KStars::exportImage( const TQString url, int w, int h ) {
 		}
 
 		//Determine desired image format from filename extension
-		TQString ext = fname.mid( fname.tqfindRev(".")+1 );
+		TQString ext = fname.mid( fname.findRev(".")+1 );
 		const char* format = "PNG";
 		if ( ext.lower() == "png" ) { format = "PNG"; }
 		else if ( ext.lower() == "jpg" || ext.lower() == "jpeg" ) { format = "JPG"; }
@@ -512,7 +512,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal)
   }
 	  
 	TQListViewItem *driverItem = NULL;
-	driverItem = indidriver->localListView->tqfindItem(deviceName, 0);
+	driverItem = indidriver->localListView->findItem(deviceName, 0);
 	if (driverItem == NULL)
 	{
 	   kdDebug() << "Device " << deviceName << " not found!" << endl;
@@ -551,7 +551,7 @@ void KStars::shutdownINDI (TQString deviceName)
   }
 	  
 	TQListViewItem *driverItem = NULL;
-	driverItem = indidriver->localListView->tqfindItem(deviceName, 0);
+	driverItem = indidriver->localListView->findItem(deviceName, 0);
 	if (driverItem == NULL)
 	{
 	   kdDebug() << "Device " << deviceName << " not found!" << endl;

kstars/kstars/kstarsinit.cpp

@@ -178,9 +178,9 @@ void KStars::initActions() {
 
 		while ( !stream.eof() ) {
 			line = stream.readLine();
-			schemeName = line.left( line.tqfind( ':' ) );
+			schemeName = line.left( line.find( ':' ) );
 			//I call it filename here, but it's used as the name of the action!
-			filename = "cs_" + line.mid( line.tqfind( ':' ) +1, line.tqfind( '.' ) - line.tqfind( ':' ) - 1 );
+			filename = "cs_" + line.mid( line.find( ':' ) +1, line.find( '.' ) - line.find( ':' ) - 1 );
 			addColorMenuItem( i18n( schemeName.local8Bit() ), filename.local8Bit() );
 		}
 		file.close();

kstars/kstars/locationdialog.cpp

@@ -224,7 +224,7 @@ void LocationDialog::initCityList( void ) {
 		filteredCityList.append( loc );
 
 		//If TZ is not even integer value, add it to listbox
-		if ( loc->TZ0() - int( loc->TZ0() ) && ! TZBox->listBox()->tqfindItem( KGlobal::locale()->formatNumber( loc->TZ0() ) ) ) {
+		if ( loc->TZ0() - int( loc->TZ0() ) && ! TZBox->listBox()->findItem( KGlobal::locale()->formatNumber( loc->TZ0() ) ) ) {
 			for ( unsigned int i=0; i<((unsigned int) TZBox->count()); ++i ) {
 				if ( TZBox->text( i ).toDouble() > loc->TZ0() ) {
 					TZBox->insertItem( KGlobal::locale()->formatNumber( loc->TZ0() ), i-1 );

kstars/kstars/main.cpp

@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 		//parse filename and image format
 		const char* format = "PNG";
 		TQString fname = args->getOption( "filename" );
-		TQString ext = fname.mid( fname.tqfindRev(".")+1 );
+		TQString ext = fname.mid( fname.findRev(".")+1 );
 		if ( ext.lower() == "png" ) { format = "PNG"; }
 		else if ( ext.lower() == "jpg" || ext.lower() == "jpeg" ) { format = "JPG"; }
 		else if ( ext.lower() == "gif" ) { format = "GIF"; }
@@ -109,8 +109,8 @@ int main(int argc, char *argv[])
 		TQString datestring = args->getOption( "date" );
 		KStarsDateTime kdt;
 		if ( ! datestring.isEmpty() ) {
-			if ( datestring.tqcontains( "-" ) ) { //assume ISODate format
+			if ( datestring.contains( "-" ) ) { //assume ISODate format
-				if ( datestring.tqcontains( ":" ) ) { //also includes time
+				if ( datestring.contains( ":" ) ) { //also includes time
 					kdt = KStarsDateTime::fromString( datestring, Qt::ISODate );
 				} else { //string probably contains date only
 					kdt.setDate( ExtDate::fromString( datestring, Qt::ISODate ) );

kstars/kstars/objectnamelist.cpp

@@ -184,11 +184,11 @@ void ObjectNameList::remove ( const TQString &name ) {
 	int index = getIndex(name);
 	SortedList <SkyObjectName> *l = &(list[language][index]);
 
-	SkyObjectName *son = tqfind( name );
+	SkyObjectName *son = find( name );
 	if ( son ) l->remove( son );
 }
 
-SkyObjectName* ObjectNameList::tqfind(const TQString &name) {
+SkyObjectName* ObjectNameList::find(const TQString &name) {
 	sort();
 	if (name.isNull()) return 0;
 	// find works only in one list and not in all lists

kstars/kstars/objectnamelist.h

@@ -87,7 +87,7 @@ class ObjectNameList {
 		*@param name name of object to find. 
 		*@return pointer to object with the given name
 		*/
-		SkyObjectName* tqfind(const TQString &name = TQString());
+		SkyObjectName* find(const TQString &name = TQString());
 
 	/**@short remove the named object from the list.
 		*@param name the name of the object to be removed.
@@ -118,7 +118,7 @@ class ObjectNameList {
 	private:
 
 	/**Sorts the lists with objects for faster access.
-		*It's needed for tqfind(). first() and tqfind() call this function.
+		*It's needed for find(). first() and find() call this function.
 		*/
 		void sort();
 

kstars/kstars/opscatalog.cpp

@@ -90,7 +90,7 @@ void OpsCatalog::updateDisplay() {
 	Options::setShowNGC( showNGC->isOn() );
 	Options::setShowIC( showIC->isOn() );
 	for ( unsigned int i=0; i<ksw->data()->customCatalogs().count(); ++i ) {
-		TQCheckListItem *item = (TQCheckListItem*)( CatalogList->tqfindItem( ksw->data()->customCatalogs().at(i)->name(), 0 ));
+		TQCheckListItem *item = (TQCheckListItem*)( CatalogList->findItem( ksw->data()->customCatalogs().at(i)->name(), 0 ));
 		Options::showCatalog()[i] = item->isOn();
 	}
 

kstars/kstars/opscolors.cpp

@@ -62,8 +62,8 @@ OpsColors::OpsColors( TQWidget *p, const char *name, WFlags fl )
 
   	while ( !stream.eof() ) {
 			line = stream.readLine();
-			schemeName = line.left( line.tqfind( ':' ) );
+			schemeName = line.left( line.find( ':' ) );
-			filename = line.mid( line.tqfind( ':' ) +1, line.length() );
+			filename = line.mid( line.find( ':' ) +1, line.length() );
 			PresetBox->insertItem( schemeName );
 			PresetFileList.append( filename );
 	  }
@@ -166,10 +166,10 @@ void OpsColors::slotAddPreset() {
 	if ( okPressed && ! schemename.isEmpty() ) {
 		if ( ksw->data()->colorScheme()->save( schemename ) ) {
 			PresetBox->insertItem( schemename );
-			PresetBox->setCurrentItem( PresetBox->tqfindItem( schemename ) );
+			PresetBox->setCurrentItem( PresetBox->findItem( schemename ) );
 			TQString fname = ksw->data()->colorScheme()->fileName();
 			PresetFileList.append( fname );
-			ksw->addColorMenuItem( schemename, TQString("cs_" + fname.left(fname.tqfind(".colors"))).utf8() );
+			ksw->addColorMenuItem( schemename, TQString("cs_" + fname.left(fname.find(".colors"))).utf8() );
 		}
 	}
 }
@@ -181,7 +181,7 @@ void OpsColors::slotRemovePreset() {
 	cdatFile.setName( locateLocal( "appdata", "colors.dat" ) ); //determine filename in local user KDE directory tree.
 
 	//Remove action from color-schemes menu
-	ksw->removeColorMenuItem( TQString("cs_" + filename.left( filename.tqfind(".colors"))).utf8() );
+	ksw->removeColorMenuItem( TQString("cs_" + filename.left( filename.find(".colors"))).utf8() );
 
 	if ( !cdatFile.exists() || !cdatFile.open( IO_ReadWrite ) ) {
 		TQString message = i18n( "Local color scheme index file could not be opened.\nScheme cannot be removed." );
@@ -205,7 +205,7 @@ void OpsColors::slotRemovePreset() {
 
 		while ( !stream.eof() ) {
 			TQString line = stream.readLine();
-			if ( line.left( line.tqfind(':') ) != name ) slist.append( line );
+			if ( line.left( line.find(':') ) != name ) slist.append( line );
 			else removed = true;
 		}
 

kstars/kstars/skymapdraw.cpp

@@ -1578,7 +1578,7 @@ void SkyMap::drawPlanetTrail( TQPainter& psky, KSPlanetBase *ksp, double scale )
 			if ( ( o.x() >= -1000 && o.x() <= Width+1000 && o.y() >=-1000 && o.y() <= Height+1000 ) ) {
 
 				//Want to disable line-drawing if this point and the last are both outside bounds of display.
-				if ( ! TQT_TQRECT_OBJECT(rect()).tqcontains( o ) && ! TQT_TQRECT_OBJECT(rect()).tqcontains( cur ) ) doDrawLine = false;
+				if ( ! TQT_TQRECT_OBJECT(rect()).contains( o ) && ! TQT_TQRECT_OBJECT(rect()).contains( cur ) ) doDrawLine = false;
 				cur = o;
 
 				if ( doDrawLine ) {

kstars/kstars/skyobject.cpp

@@ -205,7 +205,7 @@ TQTime SkyObject::transitTimeUT( const KStarsDateTime &dt, const GeoLocation *ge
 	//dt0 is the first guess at the transit time.
 	KStarsDateTime dt0 = dt.addSecs( dSec );
 
-	//recompute object's position at UT0 and then tqfind
+	//recompute object's position at UT0 and then find
 	//transit time of this refined position
 	SkyPoint sp = recomputeCoords( dt0, geo );
 	const dms *ram = sp.ra0();
@@ -342,11 +342,11 @@ TQString SkyObject::messageFromTitle( const TQString &imageTitle ) {
 	TQString message = imageTitle;
 
 	//HST Image
-	if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.tqcontains("HST") ) {
+	if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.contains("HST") ) {
 		message = i18n( "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]" ).tqarg( longname() );  
 
 	//Spitzer Image
-	} else if ( imageTitle.tqcontains( i18n( "Show Spitzer Image" ) ) ) {
+	} else if ( imageTitle.contains( i18n( "Show Spitzer Image" ) ) ) {
 		message = i18n( "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]" ).tqarg( longname() );  
 
 	//SEDS Image
@@ -358,16 +358,16 @@ TQString SkyObject::messageFromTitle( const TQString &imageTitle ) {
 		message = i18n( "%1: Advanced Observing Program at Kitt Peak National Observatory [free for non-commercial use; no physical reproductions]" ).tqarg( longname() );
 
 	//NOAO Image
-	} else if ( imageTitle.tqcontains( i18n( "Show NOAO Image" ) ) ) {
+	} else if ( imageTitle.contains( i18n( "Show NOAO Image" ) ) ) {
 		message = i18n( "%1: National Optical Astronomy Observatories and AURA [free for non-commercial use]" ).tqarg( longname() );
 
 	//VLT Image
-	} else if ( imageTitle.tqcontains( "VLT" ) ) {
+	} else if ( imageTitle.contains( "VLT" ) ) {
 		message = i18n( "%1: Very Large Telescope, operated by the European Southern Observatory [free for non-commercial use; no reproductions]" ).tqarg( longname() );
 
 	//All others
 	} else if ( imageTitle.startsWith( i18n( "Show" ) ) ) {
-		message = imageTitle.mid( imageTitle.tqfind( " " ) + 1 ); //eat first word, "Show"
+		message = imageTitle.mid( imageTitle.find( " " ) + 1 ); //eat first word, "Show"
 		message = longname() + ": " + message;
 	}
 	
@@ -408,9 +408,9 @@ void SkyObject::saveUserLog( const TQString &newLog ) {
 		int startIndex, endIndex;
 		TQString sub;
 	
-		startIndex = logs.tqfind(KSLabel);
+		startIndex = logs.find(KSLabel);
 		sub = logs.mid (startIndex);
-		endIndex = sub.tqfind("[KSLogEnd]");
+		endIndex = sub.find("[KSLogEnd]");
 	
 		logs.remove(startIndex, endIndex + 11);
 	}

kstars/kstars/skypoint.cpp

@@ -770,7 +770,7 @@ TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<S
 		if ( abbrev.lower() == o->name2().lower() ) {
 			TQString r = i18n( "Constellation name (optional)", o->name().local8Bit().data() );
 			r = r.left(1) + r.mid(1).lower(); //lowercase letters (except first letter)
-			int i = r.tqfind(" ");
+			int i = r.find(" ");
 			i++;
 			if ( i>0 ) r = r.left(i) + r.mid(i,1).upper() + r.mid(i+1); //capitalize 2nd word
 			return r;

kstars/kstars/telescopewizardprocess.cpp

@@ -230,7 +230,7 @@ int telescopeWizardProcess::establishLink()
 	  return (0);
 	  
 	TQListViewItem *driverItem = NULL;
-	driverItem = indidriver->localListView->tqfindItem(telescopeCombo->currentText(), 0);
+	driverItem = indidriver->localListView->findItem(telescopeCombo->currentText(), 0);
 	if (driverItem == NULL) return -1;
 
 	// If device is already running, we need to shut it down first

kstars/kstars/thumbnaileditor.cpp

@@ -130,7 +130,7 @@ void ThumbImage::paintEvent( TQPaintEvent* ) {
 }
 
 void ThumbImage::mousePressEvent( TQMouseEvent *e ) {
-	if ( e->button() == Qt::LeftButton && CropRect->tqcontains( e->pos() ) ) {
+	if ( e->button() == Qt::LeftButton && CropRect->contains( e->pos() ) ) {
 		bMouseButtonDown = true;
 
 		//The Anchor tells how far from the CropRect corner we clicked

kstars/kstars/thumbnailpicker.cpp

@@ -141,14 +141,14 @@ void ThumbnailPicker::parseGooglePage( TQStringList &ImList, TQString URL ) {
 		return;
 	}
 
-	int index = PageHTML.tqfind( "?imgurl=", 0 );
+	int index = PageHTML.find( "?imgurl=", 0 );
 	while ( index >= 0 ) {
 		index += 8; //move to end of "?imgurl=" marker
 
 		//Image URL is everything from index to next occurence of "&"
-		ImList.append( PageHTML.mid( index, PageHTML.tqfind( "&", index ) - index ) );
+		ImList.append( PageHTML.mid( index, PageHTML.find( "&", index ) - index ) );
 
-		index = PageHTML.tqfind( "?imgurl=", index );
+		index = PageHTML.find( "?imgurl=", index );
 	}
 }
 

kstars/kstars/timebox.cpp

@@ -91,7 +91,7 @@ TQTime timeBox::createTime ( bool *ok )
 		TQStringList fields;
 		
 		//check for colon-delimiters or space-delimiters
-		if ( entry.tqcontains(':') ) 
+		if ( entry.contains(':') ) 
 			fields = TQStringList::split( ':', entry );
 		else fields = TQStringList::split( " ", entry ); 
 
@@ -113,9 +113,9 @@ TQTime timeBox::createTime ( bool *ok )
 		// ignore all after 3rd field
 
 		if ( fields.count() >= 3 ) {
-			fields[0].tqreplace( TQRegExp("h"), "" );
+			fields[0].replace( TQRegExp("h"), "" );
-			fields[1].tqreplace( TQRegExp("m"), "" );
+			fields[1].replace( TQRegExp("m"), "" );
-			fields[2].tqreplace( TQRegExp("s"), "" );
+			fields[2].replace( TQRegExp("s"), "" );
 		}
 		//See if first two fields parse as integers.
 		//

kstars/kstars/timezonerule.cpp

@@ -168,7 +168,7 @@ int TimeZoneRule::findStartDay( const KStarsDateTime &d ) {
 	return test.day();
 }
 
-int TimeZoneRule::tqfindRevertDay( const KStarsDateTime &d ) {
+int TimeZoneRule::findRevertDay( const KStarsDateTime &d ) {
 	// Determine the calendar date of RevertDay for the month and year of the given date.
 	ExtDate test;
 
@@ -215,7 +215,7 @@ bool TimeZoneRule::isDSTActive( const KStarsDateTime &date ) {
 		if ( day < sday ) return false;
 		if ( day==sday && date.time() < StartTime ) return false;
 	} else if ( month == RevertMonth ) {
-		int rday = tqfindRevertDay( date );
+		int rday = findRevertDay( date );
 		if ( day > rday ) return false;
 		if ( day==rday && date.time() > RevertTime ) return false;
 	}
@@ -239,7 +239,7 @@ void TimeZoneRule::nextDSTChange_LTime( const KStarsDateTime &date ) {
 		if ( RevertMonth < date.date().month() ) ++y;
 
 		result = KStarsDateTime( ExtDate( y, RevertMonth, 1 ), RevertTime );
-		result = KStarsDateTime( ExtDate( y, RevertMonth, tqfindRevertDay( result ) ), RevertTime );
+		result = KStarsDateTime( ExtDate( y, RevertMonth, findRevertDay( result ) ), RevertTime );
 
 	} else {
 		// Next change is starting DST.
@@ -284,7 +284,7 @@ void TimeZoneRule::previousDSTChange_LTime( const KStarsDateTime &date ) {
 		if ( RevertMonth > date.date().month() ) --y;
 
 		result = KStarsDateTime( ExtDate( y, RevertMonth, 1 ), RevertTime );
-		result = KStarsDateTime( ExtDate( y, RevertMonth, tqfindRevertDay( result ) ), RevertTime );
+		result = KStarsDateTime( ExtDate( y, RevertMonth, findRevertDay( result ) ), RevertTime );
 	}
 
 	kdDebug() << i18n( "Previous Daylight Savings Time change (Local Time): " ) << result.toString() << endl;

kstars/kstars/timezonerule.h

@@ -158,7 +158,7 @@ private:
 		*of the given KStarsDateTime.
 		*@p d the date containing the year to be tested
 		*@return the calendar date, an integer between 1 and 31. */
-	int tqfindRevertDay( const KStarsDateTime &d );
+	int findRevertDay( const KStarsDateTime &d );
 
 	int StartDay, RevertDay;
 	int StartWeek, RevertWeek;

kstars/kstars/tools/altvstime.cpp

@@ -400,7 +400,7 @@ void AltVsTime::slotUpdateDateLoc(void) {
 				o->updateCoords( num );
 
 				//update pList entry
-				pList.tqreplace( i, (SkyPoint*)o );
+				pList.replace( i, (SkyPoint*)o );
 
 				KPlotObject *po = new KPlotObject( "", "white", KPlotObject::CURVE, 1, KPlotObject::SOLID );
 				for ( double h=-12.0; h<=12.0; h+=0.5 ) {
@@ -512,7 +512,7 @@ void AVTPlotWidget::mouseMoveEvent( TQMouseEvent *e ) {
 	int Xcursor = e->x();
 	int Ycursor = e->y();
 
-	if ( ! checkRect.tqcontains( e->x(), e->y() ) ) {
+	if ( ! checkRect.contains( e->x(), e->y() ) ) {
 		if ( e->x() < checkRect.left() )   Xcursor = checkRect.left();
 		if ( e->x() > checkRect.right() )  Xcursor = checkRect.right();
 		if ( e->y() < checkRect.top() )    Ycursor = checkRect.top();

kstars/kstars/tools/kstarsplotwidget.cpp

@@ -359,9 +359,9 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
 					case DOUBLE :
 					{
 						TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
-						int idot = str.tqfind( '.' );
+						int idot = str.find( '.' );
 						if ( idot >= 0 ) 
-							str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() );
+							str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
 						
 						if ( px > 0 && px < pW ) {
 							TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE );
@@ -427,9 +427,9 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
 					case DOUBLE :
 					{
 						TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
-						int idot = str.tqfind( '.' );
+						int idot = str.find( '.' );
 						if ( idot >= 0 ) 
-							str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() );
+							str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
 						
 						if ( py > 0 && py < pH ) {
 							TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE );
@@ -493,9 +493,9 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
 						case DOUBLE :
 						{
 							TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
-							int idot = str.tqfind( '.' );
+							int idot = str.find( '.' );
 							if ( idot >= 0 ) 
-								str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() );
+								str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
 							
 							if ( px > 0 && px < pW ) {
 								TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE );
@@ -557,9 +557,9 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
 						case DOUBLE :
 						{
 							TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
-							int idot = str.tqfind( '.' );
+							int idot = str.find( '.' );
 							if ( idot >= 0 ) 
-								str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() );
+								str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
 							
 							if ( py > 0 && py < pH ) {
 								TQRect r( pW + 2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE );

kstars/kstars/tools/observinglist.cpp

@@ -121,7 +121,7 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* tqparent )
 	ui->NotesEdit->setEnabled( false );
 }
 
-bool ObservingList::tqcontains( const SkyObject *q ) {
+bool ObservingList::contains( const SkyObject *q ) {
 	for ( SkyObject* o = obsList.first(); o; o = obsList.next() ) {
 		if ( o == q ) return true;
 	}
@@ -346,7 +346,7 @@ void ObservingList::slotSlewToObject()
   SkyPoint sp;
   
   // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element
-  // i.e. the first telescope we tqfind!
+  // i.e. the first telescope we find!
   
   INDIMenu *imenu = ks->getINDIMenu();
 

kstars/kstars/tools/observinglist.h

@@ -71,7 +71,7 @@ public:
 /**@return true if the object is in the observing list
 	*@p o pointer to the object to test.
 	*/
-	bool tqcontains( const SkyObject *o );
+	bool contains( const SkyObject *o );
 
 	SkyObject* first() { return obsList.first(); }
 	SkyObject* next() { return obsList.next(); }

kstars/kstars/tools/obslistwizard.cpp

@@ -195,32 +195,32 @@ void ObsListWizard::slotShowStackWidget( TQListViewItem *i )
 	if ( i ) {
 		TQString t = i->text(0);
 	
-		if ( t.tqcontains( i18n( "Object type(s)" ) ) )      olw->FilterStack->raiseWidget( olw->ObjTypePage );
+		if ( t.contains( i18n( "Object type(s)" ) ) )      olw->FilterStack->raiseWidget( olw->ObjTypePage );
-		if ( t.tqcontains( i18n( "Region" ) ) )              olw->FilterStack->raiseWidget( olw->RegionPage );
+		if ( t.contains( i18n( "Region" ) ) )              olw->FilterStack->raiseWidget( olw->RegionPage );
-		if ( t.tqcontains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage );
+		if ( t.contains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage );
-		if ( t.tqcontains( i18n( "Circular" ) ) )            olw->FilterStack->raiseWidget( olw->CircRegionPage );
+		if ( t.contains( i18n( "Circular" ) ) )            olw->FilterStack->raiseWidget( olw->CircRegionPage );
-		if ( t.tqcontains( i18n( "Rectangular" ) ) )         olw->FilterStack->raiseWidget( olw->RectRegionPage );
+		if ( t.contains( i18n( "Rectangular" ) ) )         olw->FilterStack->raiseWidget( olw->RectRegionPage );
-//		if ( t.tqcontains( i18n( "Observable on date" ) ) )  olw->FilterStack->raiseWidget( olw->ObsDatePage );
+//		if ( t.contains( i18n( "Observable on date" ) ) )  olw->FilterStack->raiseWidget( olw->ObsDatePage );
-		if ( t.tqcontains( i18n( "Magnitude limit" ) ) )     olw->FilterStack->raiseWidget( olw->MagLimitPage );
+		if ( t.contains( i18n( "Magnitude limit" ) ) )     olw->FilterStack->raiseWidget( olw->MagLimitPage );
 	}
 }
 
 void ObsListWizard::slotDeepSkyButton()
 {
 	olw->TypeList->selectAll( false );
-	olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Open Clusters" ) ), true );
+	olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Open Clusters" ) ), true );
-	olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) ), true );
+	olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Globular Clusters" ) ), true );
-	olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) ), true );
+	olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) ), true );
-	olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) ), true );
+	olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Planetary Nebulae" ) ), true );
-	olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Galaxies" ) ), true );
+	olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Galaxies" ) ), true );
 }
 
 void ObsListWizard::slotSolarSystemButton()
 {
 	olw->TypeList->selectAll( false );
-	olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) ), true );
+	olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) ), true );
-	olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Comets" ) ), true );
+	olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Comets" ) ), true );
-	olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Asteroids" ) ), true );
+	olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Asteroids" ) ), true );
 }
 
 void ObsListWizard::slotChangeLocation()
@@ -235,23 +235,23 @@ void ObsListWizard::slotChangeLocation()
 void ObsListWizard::slotUpdateObjectCount() 
 {
 	ObjectCount = 0;
-	if ( olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() )
+	if ( olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() )
 		ObjectCount += StarCount;
-	if ( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) 
+	if ( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) 
 		ObjectCount += PlanetCount;
-	if ( olw->TypeList->tqfindItem( i18n( "Comets" ) )->isSelected() )
+	if ( olw->TypeList->findItem( i18n( "Comets" ) )->isSelected() )
 		ObjectCount += CometCount;
-	if ( olw->TypeList->tqfindItem( i18n( "Asteroids" ) )->isSelected() )
+	if ( olw->TypeList->findItem( i18n( "Asteroids" ) )->isSelected() )
 		ObjectCount += AsteroidCount;
-	if ( olw->TypeList->tqfindItem( i18n( "Galaxies" ) )->isSelected() )
+	if ( olw->TypeList->findItem( i18n( "Galaxies" ) )->isSelected() )
 		ObjectCount += GalaxyCount;
-	if ( olw->TypeList->tqfindItem( i18n( "Open Clusters" ) )->isSelected() )
+	if ( olw->TypeList->findItem( i18n( "Open Clusters" ) )->isSelected() )
 		ObjectCount += OpenClusterCount;
-	if ( olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) )->isSelected() )
+	if ( olw->TypeList->findItem( i18n( "Globular Clusters" ) )->isSelected() )
 		ObjectCount += GlobClusterCount;
-	if ( olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) )->isSelected() )
+	if ( olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) )->isSelected() )
 		ObjectCount += GasNebCount;
-	if ( olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) )->isSelected() )
+	if ( olw->TypeList->findItem( i18n( "Planetary Nebulae" ) )->isSelected() )
 		ObjectCount += PlanNebCount;
 
 	applyFilters( false ); //false = only adjust counts, do not build list
@@ -307,7 +307,7 @@ void ObsListWizard::applyFilters( bool doBuildList )
 
 	//Stars
 	int starIndex(ksw->data()->starList.count());
-	if ( olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() ) {
+	if ( olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() ) {
 		if ( maglimit < 100. ) {
 			//Stars are sorted by mag, so use binary search algo to find index of faintest mag
 			int low(0), high(ksw->data()->starList.count()-1), middle;
@@ -338,7 +338,7 @@ void ObsListWizard::applyFilters( bool doBuildList )
 	}
 
 	//Sun, Moon, Planets
-	if ( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) {
+	if ( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) {
 		applyRegionFilter( (SkyObject*)ksw->data()->PCat->planetSun(), doBuildList );
 		applyRegionFilter( (SkyObject*)ksw->data()->Moon, doBuildList );
 		applyRegionFilter( (SkyObject*)ksw->data()->PCat->findByName("Mercury"), doBuildList );
@@ -354,12 +354,12 @@ void ObsListWizard::applyFilters( bool doBuildList )
 	//Deep sky objects
 	for ( SkyObject *o = (SkyObject*)(ksw->data()->deepSkyList.first()); o; o = (SkyObject*)(ksw->data()->deepSkyList.next()) ) {
 		//Skip unselected object types
-		if ( (o->type() == SkyObject::STAR || o->type() == SkyObject::CATALOG_STAR) && ! olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() ) continue;
+		if ( (o->type() == SkyObject::STAR || o->type() == SkyObject::CATALOG_STAR) && ! olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() ) continue;
-		if ( o->type() == SkyObject::OPEN_CLUSTER && ! olw->TypeList->tqfindItem( i18n( "Open Clusters" ) )->isSelected() ) continue;
+		if ( o->type() == SkyObject::OPEN_CLUSTER && ! olw->TypeList->findItem( i18n( "Open Clusters" ) )->isSelected() ) continue;
-		if ( o->type() == SkyObject::GLOBULAR_CLUSTER && ! olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) )->isSelected() ) continue;
+		if ( o->type() == SkyObject::GLOBULAR_CLUSTER && ! olw->TypeList->findItem( i18n( "Globular Clusters" ) )->isSelected() ) continue;
-		if ( (o->type() == SkyObject::GASEOUS_NEBULA || o->type() == SkyObject::SUPERNOVA_REMNANT) && ! olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) continue;
+		if ( (o->type() == SkyObject::GASEOUS_NEBULA || o->type() == SkyObject::SUPERNOVA_REMNANT) && ! olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) continue;
-		if ( o->type() == SkyObject::PLANETARY_NEBULA && ! olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) )->isSelected() ) continue;
+		if ( o->type() == SkyObject::PLANETARY_NEBULA && ! olw->TypeList->findItem( i18n( "Planetary Nebulae" ) )->isSelected() ) continue;
-		if ( o->type() == SkyObject::GALAXY && ! olw->TypeList->tqfindItem( i18n( "Galaxies" ) )->isSelected() ) continue;
+		if ( o->type() == SkyObject::GALAXY && ! olw->TypeList->findItem( i18n( "Galaxies" ) )->isSelected() ) continue;
 		if ( o->type() == SkyObject::TYPE_UNKNOWN ) continue;
 
 		if ( olw->SelectByMag->isChecked() ) {
@@ -380,7 +380,7 @@ void ObsListWizard::applyFilters( bool doBuildList )
 	}
 
 	//Comets
-	if ( olw->TypeList->tqfindItem( i18n( "Comets" ) )->isSelected() ) {
+	if ( olw->TypeList->findItem( i18n( "Comets" ) )->isSelected() ) {
 		for ( SkyObject *o = (SkyObject*)(ksw->data()->cometList.first()); o; o = (SkyObject*)(ksw->data()->cometList.next()) ) {
 			//comets don't have magnitudes at this point, so skip mag check
 			applyRegionFilter( o, doBuildList );
@@ -388,7 +388,7 @@ void ObsListWizard::applyFilters( bool doBuildList )
 	}
 
 	//Asteroids
-	if ( olw->TypeList->tqfindItem( i18n( "Asteroids" ) )->isSelected() ) {
+	if ( olw->TypeList->findItem( i18n( "Asteroids" ) )->isSelected() ) {
 		for ( SkyObject *o = (SkyObject*)(ksw->data()->asteroidList.first()); o; o = (SkyObject*)(ksw->data()->asteroidList.next()) ) {
 	
 			if ( olw->SelectByMag->isChecked() ) {
@@ -418,7 +418,7 @@ void ObsListWizard::applyRegionFilter( SkyObject *o, bool doBuildList, bool doAd
 	//select by constellation
 	if ( olw->SelectByConstellation->isChecked() ) {
 		TQString c( o->constellation( ksw->data()->csegmentList, ksw->data()->cnameList ) );
-		TQListBoxItem *it = olw->ConstellationList->tqfindItem( c );
+		TQListBoxItem *it = olw->ConstellationList->findItem( c );
 
 		if ( it && it->isSelected() ) { 
 			if ( doBuildList ) obsList().append ( o );

kstars/kstars/tools/scriptbuilder.cpp

@@ -709,7 +709,7 @@ void ScriptBuilder::initViewOptions() {
 
   	while ( !stream.eof() ) {
 			line = stream.readLine();
-			argLoadColorScheme->SchemeList->insertItem( line.left( line.tqfind( ':' ) ) );
+			argLoadColorScheme->SchemeList->insertItem( line.left( line.find( ':' ) ) );
 		}
 		file.close();
 	}
@@ -922,7 +922,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) {
 	ostream << "#by " << currentAuthor << endl;
 	ostream << "#last modified: " << KStarsDateTime::tqcurrentDateTime().toString() << endl;
 	ostream << "#" << endl;
-	ostream << "KSTARS=`dcoptqfind -a 'kstars*'`" << endl;
+	ostream << "KSTARS=`dcopfind -a 'kstars*'`" << endl;
 	ostream << "MAIN=KStarsInterface" << endl;
 	ostream << "CLOCK=clock#1" << endl;
 
@@ -946,7 +946,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) {
 			      sf->setINDIProperty("PARK");
 			  }
 			  
-			  if ( sf->argVal(0).tqcontains(" ")) 
+			  if ( sf->argVal(0).contains(" ")) 
 			    ostream << mainpre << "waitForINDIAction " << "\"" << sf->argVal(0) << "\" " << sf->INDIProperty() << endl;
 			  else
 			    ostream << mainpre << "waitForINDIAction " << sf->argVal(0) << " " << sf->INDIProperty() << endl;
@@ -965,11 +965,11 @@ void ScriptBuilder::readScript( TQTextStream &istream ) {
 		line = istream.readLine();
 
 		//look for name of script
-		if ( line.tqcontains( "#KStars DCOP script: " ) )
+		if ( line.contains( "#KStars DCOP script: " ) )
 			currentScriptName = line.mid( 21 ).stripWhiteSpace();
 
 		//look for author of scriptbuilder
-		if ( line.tqcontains( "#by " ) )
+		if ( line.contains( "#by " ) )
 			currentAuthor = line.mid( 4 ).stripWhiteSpace();
 
 		//Actual script functions
@@ -977,7 +977,7 @@ void ScriptBuilder::readScript( TQTextStream &istream ) {
 
 		//is ClockFunction?
 			bool clockfcn( false );
-			if ( line.tqcontains( "$CLOCK" ) ) clockfcn = true;
+			if ( line.contains( "$CLOCK" ) ) clockfcn = true;
 
 			//remove leading dcop prefix
 			line = line.mid( 20 );
@@ -1369,7 +1369,7 @@ void ScriptBuilder::slotArgWidget() {
 
 		} else if ( sf->name() == "loadColorScheme" ) {
 			sb->ArgStack->raiseWidget( argLoadColorScheme );
-			argLoadColorScheme->SchemeList->setCurrentItem( argLoadColorScheme->SchemeList->tqfindItem( sf->argVal(0).remove('\"'), 0 ) );
+			argLoadColorScheme->SchemeList->setCurrentItem( argLoadColorScheme->SchemeList->findItem( sf->argVal(0).remove('\"'), 0 ) );
 
 		} else if ( sf->name() == "stop" ) {
 			sb->ArgStack->raiseWidget( argBlank );

kstars/kstars/tools/scriptfunction.cpp

@@ -90,7 +90,7 @@ ScriptFunction::ScriptFunction( TQString name, TQString desc, bool clockfcn,
 	//before adding description, replace any '%n' instances with the corresponding
 	//argument name in color.  For now, assume that the %n's occur in order, with no skips.
 	//Also assume that '%' is *only* used to indicate argument instances
-	int narg = desc.tqcontains( '%' );
+	int narg = desc.contains( '%' );
 	switch (narg ) {
 		case 1:
 			Description += desc.tqarg( paramStyle.tqarg( an1 ) );
@@ -206,7 +206,7 @@ TQString ScriptFunction::scriptLine() const {
 	unsigned int i=0;
 	while ( ! ArgName[i].isEmpty() && i < 6 ) {
 		// Wrap arg in quotes if it contains a space
-		if ( ArgVal[i].tqcontains(" ") ) {
+		if ( ArgVal[i].contains(" ") ) {
 			out += " \"" + ArgVal[i] + "\"";
 		} else {
 			out += " " + ArgVal[i];

ktouch/extras/training-gen/python/ktouchgen.py

@@ -35,7 +35,7 @@
 
 from whrandom import randint, random
 import string
-from string import join, maketrans, translate, count, strip, lower, tqfind, upper
+from string import join, maketrans, translate, count, strip, lower, find, upper
 import time
 import sys
 import ConfigParser
@@ -173,7 +173,7 @@ def main(argv):
 
     # Parse the configfile
     # Creates a List Levelops with [(Options), ]
-    # Optiontuple tqcontains (lchars, title, rows)
+    # Optiontuple contains (lchars, title, rows)
     conf = ConfigParser.ConfigParser()
     try:
         file = open(argv[2],'r')

ktouch/src/ktouch.cpp

@@ -489,7 +489,7 @@ void KTouch::changeLecture(int num) {
 	KTouchLecture l;
 	TQString fileName = m_lectureFiles[num];
     if (!l.loadXML(this, KURL::fromPathOrURL(fileName))) {
-        KMessageBox::sorry(0, i18n("Could not tqfind/open the lecture file '%1'.").tqarg(fileName) );
+        KMessageBox::sorry(0, i18n("Could not find/open the lecture file '%1'.").tqarg(fileName) );
     	m_defaultLectureAction->setCurrentItem(-1);
 	}
 	else {
@@ -622,19 +622,19 @@ void KTouch::init() {
 
     // if keyboard tqlayout (loaded by Prefs is not available (e.g. the 
     // tqlayout file has been deleted) switch to default keyboard
-    if (m_keyboardFiles.tqcontains(Prefs::currentKeyboardFile() )==0) {
+    if (m_keyboardFiles.contains(Prefs::currentKeyboardFile() )==0) {
         TQString default_keyboard;
         // determine locale
         TQString lang = KGlobal::locale()->language();
         TQString fname = lang + ".keyboard";
         // try to find keyboard with current locale
         TQStringList::const_iterator it = m_keyboardFiles.constBegin();
-        while (it != m_keyboardFiles.constEnd()   &&   (*it).tqfind(fname) == -1)  ++it;
+        while (it != m_keyboardFiles.constEnd()   &&   (*it).find(fname) == -1)  ++it;
         if (it == m_keyboardFiles.constEnd()) {
             fname = lang.left(2) + ".keyboard";
             // try to find more general version 
             it = m_keyboardFiles.constBegin();
-            while (it != m_keyboardFiles.constEnd()   &&   (*it).tqfind(fname) == -1)  ++it;
+            while (it != m_keyboardFiles.constEnd()   &&   (*it).find(fname) == -1)  ++it;
         }
 
         if (it != m_keyboardFiles.constEnd())
@@ -755,7 +755,7 @@ void KTouch::updateFileLists() {
 
     // remove the number tqlayout, since this is the necessary default tqlayout and will be
     // added anyway
-    TQStringList::iterator it = m_keyboardFiles.tqfind("number.keyboard");
+    TQStringList::iterator it = m_keyboardFiles.find("number.keyboard");
     if (it!=m_keyboardFiles.end())      m_keyboardFiles.remove(it);
 
     m_keyboardTitles.clear();
@@ -826,7 +826,7 @@ void KTouch::updateLectureActionCheck() {
 	int num = 0;
 	TQStringList::iterator it = m_lectureFiles.begin();
 	TQString fname = Prefs::currentLectureFile(); 
-	while (it != m_lectureFiles.end()   &&   (*it).tqfind(fname) == -1) {
+	while (it != m_lectureFiles.end()   &&   (*it).find(fname) == -1) {
 		++it;
 		++num;
 	}
@@ -839,7 +839,7 @@ void KTouch::updateKeyboardActionCheck() {
 	int num = 0;
 	TQStringList::iterator it = m_keyboardFiles.begin();
 	TQString fname = Prefs::currentKeyboardFile(); 
-	while (it != m_keyboardFiles.end()   &&   (*it).tqfind(fname) == -1) {
+	while (it != m_keyboardFiles.end()   &&   (*it).find(fname) == -1) {
 		++it;
 		++num;
 	}

ktouch/src/ktouchlecture.cpp

@@ -129,9 +129,9 @@ bool KTouchLecture::readLecture(TQTextStream& in) {
         // only consider non-empty lines
         if (!line.isEmpty()) {
             // lecture title?
-            if (line.tqfind("# Title:") == 0)
+            if (line.find("# Title:") == 0)
                 m_title = line.right(line.length() - 8).stripWhiteSpace();
-            else if (line[0]!='#' || line.tqfind("# Comment:")!=-1) {
+            else if (line[0]!='#' || line.find("# Comment:")!=-1) {
                 // ok, after all those comment lines, we finally found the beginn of a level
                 in_level = true;
                 current_level += line + '\n';

ktouch/src/ktouchlecture.h

@@ -27,7 +27,7 @@ class KURL;
 /// This class handles the lecture data and provides the lines to type.
 ///
 /// It contains the level data (see KTouchLevelData). A lecture object
-/// tqcontains <b>ALWAYS</b> at least one lecture.<p>
+/// contains <b>ALWAYS</b> at least one lecture.<p>
 /// The lecture data can be read and written using the member functions 
 /// readLecture() and writeLecture().<p>
 /// During a training session the program will occasionally need a new

ktouch/src/ktouchleveldata.cpp

@@ -45,7 +45,7 @@ bool KTouchLevelData::readLevel(TQTextStream& in) {
     while (!line.isNull()) {
         if (!line.isEmpty()) {
             // Do we have a comment here? And if yes, is a keyword in the line?
-            if (line.tqfind("# Comment:")==0)
+            if (line.find("# Comment:")==0)
                 m_comment = line.right(line.length() - 10).stripWhiteSpace();
             else if (line[0]!='#') {
                 // the first line is the new characters line

ktouch/src/ktouchstatisticsdata.cpp

@@ -157,7 +157,7 @@ void KTouchLevelStats::addCorrectChar(TQChar key) {
 		else
 			++(const_cast<KTouchCharStats&>(*it).m_correctCount);
         // this const_cast is necessary because the current gcc 3.2 has a bug in the
-        // implementation of set::tqfind(). The non-const overload is missing and tqfind() always
+        // implementation of set::find(). The non-const overload is missing and find() always
         // returns a const object. Maybe in the next release this will be fixed. Until then
         // the const_cast helps.
 	}
@@ -179,7 +179,7 @@ void KTouchLevelStats::addWrongChar(TQChar key) {
 	else
 		++(const_cast<KTouchCharStats&>(*it).m_wrongCount);
         // this const_cast is necessary because the current gcc 3.2 has a bug in the
-        // implementation of set::tqfind(). The non-const overload is missing and tqfind() always
+        // implementation of set::find(). The non-const overload is missing and find() always
         // returns a const object. Maybe in the next release this will be fixed. Until then
         // the const_cast helps.
 }
@@ -324,7 +324,7 @@ void KTouchSessionStats::addCorrectChar(TQChar key) {
 		else
 			++(const_cast<KTouchCharStats&>(*it).m_correctCount);
         // this const_cast is necessary because the current gcc 3.2 has a bug in the
-        // implementation of set::tqfind(). The non-const overload is missing and tqfind() always
+        // implementation of set::find(). The non-const overload is missing and find() always
         // returns a const object. Maybe in the next release this will be fixed. Until then
         // the const_cast helps.
 	}
@@ -346,7 +346,7 @@ void KTouchSessionStats::addWrongChar(TQChar key) {
 	else
 		++(const_cast<KTouchCharStats&>(*it).m_wrongCount);
         // this const_cast is necessary because the current gcc 3.2 has a bug in the
-        // implementation of set::tqfind(). The non-const overload is missing and tqfind() always
+        // implementation of set::find(). The non-const overload is missing and find() always
         // returns a const object. Maybe in the next release this will be fixed. Until then
         // the const_cast helps.
 }

kturtle/src/canvas.cpp

@@ -18,7 +18,7 @@
 
  
 // Note on this file:
-// It tqcontains 200 lines of code just to make sure very long line are drawn correctly
+// It contains 200 lines of code just to make sure very long line are drawn correctly
 // till a certain extent... Beyond that extent the code just cuts the crap, since use user
 // it then probably not doing anything usefull anymore; so he she will not notice the code
 // is cheating a bit in order to prevent CPU hogging.
@@ -297,11 +297,11 @@ void Canvas::slotPrint(TQString text)
 void Canvas::slotFontType(TQString family, TQString extra)
 {
 	font.setFamily(family);
-	font.setBold( extra.tqcontains("bold") > 0 );
+	font.setBold( extra.contains("bold") > 0 );
-	font.setItalic( extra.tqcontains("italic") > 0 );
+	font.setItalic( extra.contains("italic") > 0 );
-	font.setUnderline( extra.tqcontains("underline") > 0 );
+	font.setUnderline( extra.contains("underline") > 0 );
-	font.setOverline( extra.tqcontains("overline") > 0 );
+	font.setOverline( extra.contains("overline") > 0 );
-	font.setStrikeOut( extra.tqcontains("strikeout") > 0 );
+	font.setStrikeOut( extra.contains("strikeout") > 0 );
 }
 
 void Canvas::slotFontSize(int px)

kturtle/src/executer.cpp

@@ -329,7 +329,7 @@ void Executer::execForEach(TreeNode* node)
 	
 	bBreak = false;
 	
-	int i = expStr2.tqcontains(expStr1, false);
+	int i = expStr2.contains(expStr1, false);
 	for ( ; i > 0; i-- )
 	{
 		if (bAbort) return;

kturtle/src/kturtle.cpp

@@ -650,7 +650,7 @@ void MainWindow::slotMessageDialog(TQString text)
 
 
 
-// BEGIN editor connections (undo, redo, cut, copy, paste, cursor, selections, tqfind, tqreplace, linenumbers etc.)
+// BEGIN editor connections (undo, redo, cut, copy, paste, cursor, selections, find, replace, linenumbers etc.)
 
 void MainWindow::slotEditor()
 {
@@ -716,7 +716,7 @@ void MainWindow::slotClearSelection()
 
 void MainWindow::slotFind()
 {
-	KAction *a = editor->actionCollection()->action("edit_tqfind");
+	KAction *a = editor->actionCollection()->action("edit_find");
 	a->activate();
 }
 
@@ -734,7 +734,7 @@ void MainWindow::slotFindPrevious()
 
 void MainWindow::slotReplace()
 {
-	KAction* a = editor->actionCollection()->action("edit_tqreplace");
+	KAction* a = editor->actionCollection()->action("edit_replace");
 	a->activate();
 }
 
@@ -1071,7 +1071,7 @@ void MainWindow::slotContextHelpUpdate()
 	int start, length, pos;
 	
 	pos = 0;
-	if ( line.tqcontains('"') )
+	if ( line.contains('"') )
 	{
 		TQRegExp delimitedStrings("(\"[^\"\\\\\\r\\n]*(\\\\.[^\"\\\\\\r\\n]*)*\")");
 		while ( delimitedStrings.search(line, pos) != -1 )
@@ -1112,13 +1112,13 @@ void MainWindow::slotContextHelpUpdate()
 			else if ( !translate->name2key(  cursorWord.lower() ).isEmpty() ) helpKeyword = cursorWord;
 			else if ( !translate->alias2key( cursorWord.lower() ).isEmpty() ) helpKeyword = cursorWord;
 
-			else if ( cursorWord.tqfind( TQRegExp("[\\d.]+") ) == 0 ) helpKeyword = i18n("<number>");
+			else if ( cursorWord.find( TQRegExp("[\\d.]+") ) == 0 ) helpKeyword = i18n("<number>");
 
-			else if ( cursorWord.tqfind( TQRegExp("[+\\-*/\\(\\)]") ) == 0 ) helpKeyword = i18n("<math>");
+			else if ( cursorWord.find( TQRegExp("[+\\-*/\\(\\)]") ) == 0 ) helpKeyword = i18n("<math>");
 
 			else if ( cursorWord == TQString("=") ) helpKeyword = i18n("<assignment>");
 
-			else if ( cursorWord.tqfind( TQRegExp("==|<|>|<=|>=|!=") ) == 0 ) helpKeyword = i18n("<question>");
+			else if ( cursorWord.find( TQRegExp("==|<|>|<=|>=|!=") ) == 0 ) helpKeyword = i18n("<question>");
 
 			// if we come here we either have an ID of some sort or an error
 			// all we can do is try to catch some errors (TODO) and then...

kturtle/src/parser.cpp

@@ -188,7 +188,7 @@ TreeNode* Parser::Factor()
 
 		case tokUnknown:
 			node = getId();
-			if (learnedFunctionList.tqcontains(rememberedToken.look) > 0) // is function call
+			if (learnedFunctionList.contains(rememberedToken.look) > 0) // is function call
 			{
 				delete node;
 				node = FunctionCall(rememberedToken);
@@ -1057,7 +1057,7 @@ TreeNode* Parser::Other()
 	matchToken(tokUnknown);
 
 	if (currentToken.type == tokAssign) return Assignment(rememberedToken);
-	else if (learnedFunctionList.tqcontains(rememberedToken.look) > 0)
+	else if (learnedFunctionList.contains(rememberedToken.look) > 0)
 	{
 		TreeNode* node;
 		node = FunctionCall(rememberedToken);

kverbos/kverbos/data/en/verbos.verbos

@@ -715,7 +715,7 @@ ducharse
 to take a shower
 0
 encontrar
-to tqfind
+to find
 3
 encontrarse
 to encounter, to meet

kverbos/kverbos/kverbos.cpp

@@ -258,10 +258,10 @@ void KVerbosApp::readOptions()
     key.setNum(i);
     TQString options = config->readEntry ( key, "true false false");
     int pos1 = 0;
-    int pos2 = options.tqfind (' ', pos1, false);
+    int pos2 = options.find (' ', pos1, false);
     timeOptions[i][0] = (options.left(pos2) == "true") ? true : false;
     pos1 =  pos2 + 1;
-    pos2 = options.tqfind (' ', pos1, false);
+    pos2 = options.find (' ', pos1, false);
     timeOptions[i][1] = (options.mid(pos1,pos2-pos1) == "true") ? true : false;
     timeOptions[i][2] = (options.right(options.length()-pos2-1) == "true") ? true : false;
   };

kverbos/kverbos/kverbosdoc.cpp

@@ -232,9 +232,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f)
 			s = t.readLine();
 			if (s.left(9) == "<td width")
 			{
-				int a = s.tqfind('>', 22, true);
+				int a = s.find('>', 22, true);
 				a++;
-				int e = s.tqfind('<', a, true);
+				int e = s.find('<', a, true);
 				v[count1] = s.mid(a, e-a);
 				count1++;
 			};
@@ -294,9 +294,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f)
 					s = t.readLine();
 					if ((s.left(4) == "<td>") && (s != "<td></td><td></td><td></td><td></td><td></td></tr><tr>"))
 					{
-						int a = s.tqfind('>', 2, true);
+						int a = s.find('>', 2, true);
 						a++;
-						int e = s.tqfind('<', a, true);
+						int e = s.find('<', a, true);
 						forms[count2] = s.mid(a, e-a);
 						count2++;
 						if (14 == count2)
@@ -324,9 +324,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f)
 					{
 						// kommt ein Leerzeichen vor, muss man die Form aufteilen: In das
 						// Reflexivpronomen und das eigentliche Verb
-						if (forms[i].tqfind(' ') >= 0)
+						if (forms[i].find(' ') >= 0)
 						{
-							NewVerb.setForm(a, b, forms[i].right(forms[i].length()-forms[i].tqfind(' ')-1));
+							NewVerb.setForm(a, b, forms[i].right(forms[i].length()-forms[i].find(' ')-1));
 						}
 						else
 						{
@@ -344,9 +344,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f)
 					int offs = 30;
 					// kommt ein Leerzeichen vor, muss man die Form aufteilen: In das
 					// Reflexivpronomen und das eigentliche Verb      	
-					if (forms[i+offs].tqfind(' ') >= 0)
+					if (forms[i+offs].find(' ') >= 0)
 					{
-						NewVerb.setForm(a, b, forms[i+offs].right(forms[i+offs].length()-forms[i+offs].tqfind(' ')-1));
+						NewVerb.setForm(a, b, forms[i+offs].right(forms[i+offs].length()-forms[i+offs].find(' ')-1));
 					}
 					else
 					{

kverbos/kverbos/kverbosuser.cpp

@@ -34,8 +34,8 @@ KVerbosUser::KVerbosUser(spanishVerbList* pL, TQString n/*=DEFAULTUSER*/)
 {
 	// try to read the user-information if there is one.
 	int pos;
-	while ((pos = n.tqfind(' ')) != -1)
+	while ((pos = n.find(' ')) != -1)
-		n.tqreplace(pos, 1, "_");
+		n.replace(pos, 1, "_");
 	TQFile file(locateLocal("data", "/kverbos/data/"+name+".kverbos"));
 	if ( file.open(IO_ReadOnly) )
 	{
@@ -61,7 +61,7 @@ KVerbosUser::KVerbosUser(spanishVerbList* pL, TQString n/*=DEFAULTUSER*/)
 			else
 				e.counter = 0;
 			e.used = false;
-			it = liste.tqfind(e);
+			it = liste.find(e);
 			if (liste.end() == it)
 				liste.append(e);
 		};
@@ -97,7 +97,7 @@ void KVerbosUser::fillList(spanishVerbList* pL)
 		elem.verb = (*it2).getSpanish();
 		elem.right = elem.wrong = elem.counter = elem.status = 0;
 		elem.used = true;
-		it = liste.tqfind(elem);
+		it = liste.find(elem);
 		if (liste.end() == it)
 			liste.append(elem);
 		else
@@ -209,8 +209,8 @@ bool KVerbosUser::saveUser(const int& res, const int& num)
 	if (name != DEFAULTUSER)
 	{
 		int pos;
-		while ((pos = name.tqfind(' ')) != -1)
+		while ((pos = name.find(' ')) != -1)
-			name.tqreplace(pos, 1, "_");		
+			name.replace(pos, 1, "_");		
 		TQFile file(locateLocal("data", "/kverbos/data/"+name+".kverbos"));
 		if ( file.open(IO_WriteOnly) )
 		{

kverbos/kverbos/kverbosview.cpp

@@ -102,12 +102,12 @@ TQString KVerbosView::deleteAccents(const TQString& s) const
     for (unsigned int i=0; i<s2.length(); i++)
     {
       TQString t = s2.mid(i, 1);
-      if (t == "á") s2.tqreplace(i, 1, "a");
+      if (t == "á") s2.replace(i, 1, "a");
-      if (t == "é") s2.tqreplace(i, 1, "e");
+      if (t == "é") s2.replace(i, 1, "e");
-      if (t == "í") s2.tqreplace(i, 1, "i");
+      if (t == "í") s2.replace(i, 1, "i");
-      if (t == "ó") s2.tqreplace(i, 1, "o");
+      if (t == "ó") s2.replace(i, 1, "o");
-      if (t == "ú") s2.tqreplace(i, 1, "u");
+      if (t == "ú") s2.replace(i, 1, "u");
-      if (t == "ñ") s2.tqreplace(i, 1, "n");
+      if (t == "ñ") s2.replace(i, 1, "n");
     };
   };
   return s2;
@@ -251,7 +251,7 @@ void KVerbosView::slotCorregir()
 	TQPalette palette = EditVerbo->palette();
 	palette.setColor(TQColorGroup::Text, red);
 	palette.setColor(TQColorGroup::Base, white);
-	if ( 0 > formen[6][1].tqfind(EditAleman->text().simplifyWhiteSpace(), 0))
+	if ( 0 > formen[6][1].find(EditAleman->text().simplifyWhiteSpace(), 0))
 	{
 		EditAleman->setFont(fontBold);
 		EditAleman->setPalette(palette);

kverbos/kverbos/verbspanish.cpp

@@ -582,10 +582,10 @@ bool verbSpanish::conjugateAll()
 				// Bei Verben der Gruppe 5 ändert sich der Stamm für den Gerund
 				if (getGroup() == 5)
 				{          	  	
-					int pos = gerund.tqfindRev("e");
+					int pos = gerund.findRev("e");
 					if (pos>=0)
 					{
-						gerund.tqreplace(pos, 1, "i");	
+						gerund.replace(pos, 1, "i");	
 					};
 				}
 				gerund += "iendo#";
@@ -606,19 +606,19 @@ bool verbSpanish::vergleich(const TQString& s1, const TQString& s2) const
 {
 	bool gleich=false;
 	unsigned int l=0;
-	int r=s1.tqfind(",", l);
+	int r=s1.find(",", l);
 	while ((l<s1.length()) && (false==gleich))
 	{
 		if (-1 == r)
 		  r = s1.length();
-		if (s2.tqfind(s1.mid(l, r-l).simplifyWhiteSpace(), 0) != -1)
+		if (s2.find(s1.mid(l, r-l).simplifyWhiteSpace(), 0) != -1)
 		{
 		  gleich = true;
 		}
 		else
 		{
 			l = r+1;
-			r=s1.tqfind(",", l);
+			r=s1.find(",", l);
 		};
 	};
 	return gleich;
@@ -675,9 +675,9 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 		{
 			if ((nosotros != person) && (vosotros != person))
 			{
-				pos = s.tqfindRev("e");
+				pos = s.findRev("e");
 				if (pos>=0)
-					s.tqreplace(pos, 1, "ie");
+					s.replace(pos, 1, "ie");
 			};
 		};
 		break;
@@ -690,9 +690,9 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 		{
 			if ((nosotros != person) && (vosotros != person))
 			{
-				pos = s.tqfindRev("o", -3);
+				pos = s.findRev("o", -3);
 				if (pos>=0)
-					s.tqreplace(pos, 1, "ue");
+					s.replace(pos, 1, "ue");
 			};
 		};	
 		break;
@@ -705,9 +705,9 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 		{
 			if ((nosotros != person) && (vosotros != person))
 			{
-				pos = s.tqfindRev("u");
+				pos = s.findRev("u");
 				if (pos>=0)
-					s.tqreplace(pos, 1, "ue");
+					s.replace(pos, 1, "ue");
 			};
 		};	
 		break;
@@ -719,10 +719,10 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 		if ((presente == time) && (person != nosotros) && (person != vosotros))
 		{
 			TQString st = getStem();
-			pos = st.tqfindRev("e");
+			pos = st.findRev("e");
 			if (pos>=0)
 			{
-				st.tqreplace(pos, 1, "i");	
+				st.replace(pos, 1, "i");	
 				s = st + verbEndings[time][getEnding(good)][person];
 			};
 		}
@@ -730,10 +730,10 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 		if ((indefinido == time) && ((el == person)||(ellos == person)))
 		{
 			TQString st = getStem();
-			pos = st.tqfindRev("e");
+			pos = st.findRev("e");
 			if (pos>=0)
 			{
-				st.tqreplace(pos, 1, "i");	
+				st.replace(pos, 1, "i");	
 				s = st + verbEndings[time][getEnding(good)][person];
 			};	
 		}
@@ -745,91 +745,91 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 			};	
 		break;
 	case 6: // <c -> qu> (vor e wird c zu qu)
-		pos = s.tqfindRev("ce");
+		pos = s.findRev("ce");
 		if (pos>=0)
-			s.tqreplace(pos, 2, "que");			
+			s.replace(pos, 2, "que");			
 		else
 		{
-			pos = s.tqfindRev("cé");
+			pos = s.findRev("cé");
 			if (pos>=0)
-				s.tqreplace(pos, 2, "qué");
+				s.replace(pos, 2, "qué");
 		}
 		break;
 	case 7: // <g -> gu> (vor e wird g zu gu)
-		pos = s.tqfindRev("ge");
+		pos = s.findRev("ge");
 		if (pos>=0)
-			s.tqreplace(pos, 2, "gue");		
+			s.replace(pos, 2, "gue");		
 		else
 		{
-			pos = s.tqfindRev("gé");
+			pos = s.findRev("gé");
 			if (pos>=0)
-				s.tqreplace(pos, 2, "gué");
+				s.replace(pos, 2, "gué");
 		}
 		break;
 	case 8: // <z -> c> (vor e wird z zu c)
-		pos = s.tqfindRev("ze");
+		pos = s.findRev("ze");
 		if (pos>=0)
-			s.tqreplace(pos, 2, "ce");	
+			s.replace(pos, 2, "ce");	
 		else
 		{
-			pos = s.tqfindRev("zé");
+			pos = s.findRev("zé");
 			if (pos>=0)
-				s.tqreplace(pos, 2, "cé");
+				s.replace(pos, 2, "cé");
 		}
 		break;
 	case 9: // <gu -> gü> (vor e wird gu zu gü)
-		pos = s.tqfindRev("gue");
+		pos = s.findRev("gue");
 		if (pos>=0)
-			s.tqreplace(pos, 3, "güe");
+			s.replace(pos, 3, "güe");
 		else
 		{
-			pos = s.tqfindRev("gué");
+			pos = s.findRev("gué");
 			if (pos>=0)
-				s.tqreplace(pos, 3, "güé");
+				s.replace(pos, 3, "güé");
 		}
 	break;
 	case 10: // <c -> z> (vor o und a wird c zu z)
-		pos = s.tqfindRev("co");
+		pos = s.findRev("co");
 		if (pos>=0)
-			s.tqreplace(pos, 2, "zo");
+			s.replace(pos, 2, "zo");
 		else
 		{
-			pos = s.tqfindRev("ca");
+			pos = s.findRev("ca");
 			if (pos>=0)
-				s.tqreplace(pos, 2, "za");
+				s.replace(pos, 2, "za");
 		};
 		break;
 	case 11: // <g -> j> (vor o und a wird g zu j)
-		pos = s.tqfindRev("ga");
+		pos = s.findRev("ga");
 		if (pos>=0)
-			s.tqreplace(pos, 2, "ja");
+			s.replace(pos, 2, "ja");
 		else
 		{
-			pos = s.tqfindRev("go");
+			pos = s.findRev("go");
 			if (pos>=0)
-				s.tqreplace(pos, 2, "jo");
+				s.replace(pos, 2, "jo");
 		};
 		break;
 	case 12: // <gu -> g> (vor o und a wird gu zu g)
-		pos = s.tqfindRev("guo");
+		pos = s.findRev("guo");
 		if (pos>=0)
-			s.tqreplace(pos, 3, "go");
+			s.replace(pos, 3, "go");
 		else
 		{
-			pos = s.tqfindRev("gua");
+			pos = s.findRev("gua");
 			if (pos>=0)
-				s.tqreplace(pos, 3, "ga");
+				s.replace(pos, 3, "ga");
 		};
 		break;
 	case 13: // <qu -> c> (vor o und a wird qu zu c)
-		pos = s.tqfindRev("quo");
+		pos = s.findRev("quo");
 		if (pos>=0)
-			s.tqreplace(pos, 3, "co");
+			s.replace(pos, 3, "co");
 		else
 		{
-			pos = s.tqfindRev("qua");
+			pos = s.findRev("qua");
 			if (pos>=0)
-				s.tqreplace(pos, 3, "ca");
+				s.replace(pos, 3, "ca");
 		};
 		break;
 	case 14: // <accent like 'enviar'>

kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp

@@ -1026,10 +1026,10 @@ void LanguageOptions::loadCountryData()
     TQString tag = *it;
     int index;
 
-    index = tag.tqfindRev('/');
+    index = tag.findRev('/');
     if (index != -1) tag = tag.mid(index + 1);
 
-    index = tag.tqfindRev('.');
+    index = tag.findRev('.');
     if (index != -1) tag.truncate(index);
 
     KSimpleConfig entry(*it);
@@ -1051,9 +1051,9 @@ void LanguageOptions::loadCountryData()
     TQString submenu = entry.readEntry(TQString::tqfromLatin1("Region"));
 
     TQString tag = *sit;
-    int index = tag.tqfindRev('/');
+    int index = tag.findRev('/');
     tag.truncate(index);
-    index = tag.tqfindRev('/');
+    index = tag.findRev('/');
     tag = tag.mid(index+1);
 
     if (tag == "C")
@@ -1063,7 +1063,7 @@ void LanguageOptions::loadCountryData()
     TQValueList<int> langs;
 
     TQString pixmap = *sit;
-    index = pixmap.tqfindRev('/');
+    index = pixmap.findRev('/');
     pixmap.truncate(index);
     pixmap += "/flag.png";
 
@@ -1071,8 +1071,8 @@ void LanguageOptions::loadCountryData()
     {
       // Treat ie "en_GB" and "en_USE" as "en" because the language list
       // only contains the first letters
-      if ((*it).tqfind("_"))
+      if ((*it).find("_"))
-        *it = (*it).left((*it).tqfind("_"));
+        *it = (*it).left((*it).find("_"));
 
       int id = global_langset.indexShortId(*it);
       if (id > 0)
@@ -1126,7 +1126,7 @@ void LanguageOptions::loadCountryData()
 
 void LanguageOptions::slotLangFromGlobalActivated(int i)
 {
-  if (countryIdMap.tqcontains(i))
+  if (countryIdMap.contains(i))
   {
     Country c = countryIdMap[i];
     bool first = true;

kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp

@@ -113,7 +113,7 @@ void ProfilesDialog::slotStoreGroup()
 
 static bool extract (TQString &line, TQString &ret)
 {
-  int lim = line.tqfind (",");
+  int lim = line.find (",");
   if (lim < 0)
   {
     ret = "";
@@ -187,7 +187,7 @@ void ProfilesDialog::selectProfile(int profile)
     { // new style: multiple lessons
       int pos;
       line.remove(0, 1);
-      if ((pos = line.tqfind(')')) > 0)
+      if ((pos = line.find(')')) > 0)
       {
         s = line.left (pos);
         line.remove (0, pos+1);

kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp

@@ -107,7 +107,7 @@ void LessOptPage::slotModifyLesson()
   if (lessonList->count() != 0 && (int) lessonList->count() > act_lesson)
   {
     TQString str = lessonList->text (act_lesson);
-    int pos = str.tqfind (LESS_TAG);
+    int pos = str.find (LESS_TAG);
     str.remove (0, pos+strlen (LESS_TAG));
     bool ok;
     TQString getLesson = KInputDialog::getText(
@@ -129,7 +129,7 @@ void LessOptPage::updateListBox(int start)
   for (int i = start; i < (int) lessonList->count(); i++)
   {
     str = lessonList->text (i);
-    int pos = str.tqfind (LESS_TAG);
+    int pos = str.find (LESS_TAG);
     str.remove (0, pos+strlen (LESS_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -179,7 +179,7 @@ void LessOptPage::getLesson (TQComboBox *ret_lesson, vector<int> &ret_Index)
   TQString str;
   for (int i = 0; i < (int) lessonList->count(); i++) {
     str = lessonList->text(i);
-    int pos = str.tqfind (LESS_TAG);
+    int pos = str.find (LESS_TAG);
     str.remove (0, pos+strlen (LESS_TAG));
     ret_lesson->insertItem (str);
   }

kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp

@@ -106,7 +106,7 @@ void TenseOptPage::slotModifyTense()
   if (tenseList->count() != 0 && (int) tenseList->count() > act_tense) 
   {
     TQString str = tenseList->text (act_tense);
-    int pos = str.tqfind (TENSE_TAG);
+    int pos = str.find (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     bool ok;
     TQString getTense = KInputDialog::getText(
@@ -128,7 +128,7 @@ void TenseOptPage::updateListBox(int start)
   for (int i = start; i < (int) tenseList->count(); i++) 
   {
     str = tenseList->text (i);
-    int pos = str.tqfind (TENSE_TAG);
+    int pos = str.find (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -185,7 +185,7 @@ void TenseOptPage::getTenseNames (vector<TQString> &ret_tense, vector<int> &ret_
   for (int i = 0; i < (int) tenseList->count(); i++) 
   {
     str = tenseList->text(i);
-    int pos = str.tqfind (TENSE_TAG);
+    int pos = str.find (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     ret_tense.push_back (str);
   }

kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp

@@ -105,7 +105,7 @@ void TypeOptPage::slotModifyType()
   if (typeList->count() != 0
       && (int) typeList->count() > act_type) {
     TQString str = typeList->text (act_type);
-    int pos = str.tqfind (TYPE_TAG);
+    int pos = str.find (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     bool ok;
     TQString getType = KInputDialog::getText(
@@ -126,7 +126,7 @@ void TypeOptPage::updateListBox(int start)
   TQString str, str2;
   for (int i = start; i < (int) typeList->count(); i++) {
     str = typeList->text (i);
-    int pos = str.tqfind (TYPE_TAG);
+    int pos = str.find (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -179,7 +179,7 @@ void TypeOptPage::getTypeNames (vector<TQString> &ret_type, vector<int> &ret_Ind
   TQString str;    ret_type.clear();
   for (int i = 0; i < (int) typeList->count(); i++) {
     str = typeList->text(i);
-    int pos = str.tqfind (TYPE_TAG);
+    int pos = str.find (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     ret_type.push_back (str);
   }

kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp

@@ -106,7 +106,7 @@ void UsageOptPage::slotModifyUsage()
   if (usageList->count() != 0
       && (int) usageList->count() > act_usage) {
     TQString str = usageList->text (act_usage);
-    int pos = str.tqfind (USAGE_TAG);
+    int pos = str.find (USAGE_TAG);
     str.remove (0, pos+strlen (USAGE_TAG));
 
     bool ok;
@@ -129,7 +129,7 @@ void UsageOptPage::updateListBox(int start)
   for (int i = start; i < (int) usageList->count(); i++) 
   {
     str = usageList->text (i);
-    int pos = str.tqfind (USAGE_TAG);
+    int pos = str.find (USAGE_TAG);
     str.remove (0, pos+strlen (USAGE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -153,7 +153,7 @@ void UsageOptPage::slotDeleteUsage()
       kvoctrainExpr *exp = doc->getEntry(ent);
       for (int lang = 0; lang < doc->numLangs(); lang++) {
         TQString ul = exp->getUsageLabel(lang) + UL_USAGE_DIV;
-        if (ul.tqfind(t) >= 0 ) {
+        if (ul.find(t) >= 0 ) {
           KMessageBox::information(this,
                     i18n("usage (area) of an expression",
                         "This user-defined usage label could not be deleted "
@@ -187,7 +187,7 @@ void UsageOptPage::getUsageLabels (vector<TQString> &ret_usage,
   TQString str;    ret_usage.clear();
   for (int i = 0; i < (int) usageList->count(); i++) {
     str = usageList->text(i);
-    int pos = str.tqfind (USAGE_TAG);
+    int pos = str.find (USAGE_TAG);
     str.remove (0, pos+strlen (USAGE_TAG));
     ret_usage.push_back (str);
   }
@@ -209,7 +209,7 @@ void UsageOptPage::slotCleanup()
         t.remove (0, 1);
 
         int next;
-        if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
+        if ((next = t.find(UL_USAGE_DIV)) >= 0) {
           n = t.left(next);
           t.remove (0, next+1);
         }
@@ -277,7 +277,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc,
           TQString n;
           t.remove (0, 1);
           int next;
-          if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
+          if ((next = t.find(UL_USAGE_DIV)) >= 0) {
             n = t.left(next);
             t.remove (0, next+1);
           }

kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp

@@ -208,7 +208,7 @@ void CommonEntryPage::setUsageBox(const TQString & act_usage)
   usage_box->clear();
   for (int i = 0; i < (int) usages.size(); i++) {
     usage_box->insertItem (usages[i].longStr());
-    if (UsageManager::tqcontains(TQString(usages[i].identStr()), act_usage)) {
+    if (UsageManager::contains(TQString(usages[i].identStr()), act_usage)) {
       usage_box->setSelected (i, true);
     }
   }

kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp

@@ -269,7 +269,7 @@ void EntryDlg::updatePages(const TQString &type)
 {
   TQString main;
   int pos;
-  if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0)  // only use main type
+  if ((pos = type.find (TQM_TYPE_DIV)) < 0)  // only use main type
     main = type;
   else
     main = type.left(pos);
@@ -311,7 +311,7 @@ void EntryDlg::setEnabled(int enable)
   TQString type = comm_page->getType();
   TQString main;
   int pos;
-  if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0)  // only use main type
+  if ((pos = type.find (TQM_TYPE_DIV)) < 0)  // only use main type
     main = type;
   else
     main = type.left(pos);

kvoctrain/kvoctrain/kva_clip.cpp

@@ -41,9 +41,9 @@ void kvoctrainApp::slotSmartSearchClip()
   TQString entries = TQApplication::tqclipboard()->text();
 
   if (!entries.isEmpty()) {
-    int pos = entries.tqfind ('\n'); // search for a line end
+    int pos = entries.find ('\n'); // search for a line end
     if (pos < 0)
-      pos = entries.tqfind ('\r');
+      pos = entries.find ('\r');
 
     if (pos < 0)    // just first "line"
       s = entries;
@@ -175,9 +175,9 @@ void kvoctrainApp::slotEditPaste()
   TQString num;
 // view->setView(0, langset, gradecols);
   while (!entries.isEmpty()) {
-    int pos = entries.tqfind ('\n'); // search for a line end
+    int pos = entries.find ('\n'); // search for a line end
     if (pos < 0) {
-      pos = entries.tqfind ('\r');   // mac style ?
+      pos = entries.find ('\r');   // mac style ?
     }
 
     if (pos < 0) {

kvoctrain/kvoctrain/kva_io.cpp

@@ -349,7 +349,7 @@ void kvoctrainApp::slotFileMerge()
               TQString n;
               t.remove (0, 1);
               int next;
-              if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
+              if ((next = t.find(UL_USAGE_DIV)) >= 0) {
                 n = t.left(next);
                 t.remove (0, next+1);
               }

kvoctrain/kvoctrain/kvoctraintable.cpp

@@ -76,7 +76,7 @@ void KVocTrainTable::setCurrentItem(int row)
   setCurrentRow(row, currentColumn());
 }
 /*
-TQWidget* KVocTrainTable::beginEdit(int row, int col, bool tqreplace)
+TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace)
 {
   if (KApplication::dcopClient()->isApplicationRegistered("kxkb"))
   {
@@ -103,12 +103,12 @@ TQWidget* KVocTrainTable::beginEdit(int row, int col, bool tqreplace)
       }
     }
   }
-  return TQTable::beginEdit(row, col, tqreplace);
+  return TQTable::beginEdit(row, col, replace);
 }
 
-void KVocTrainTable::endEdit(int row, int col, bool accept, bool tqreplace)
+void KVocTrainTable::endEdit(int row, int col, bool accept, bool replace)
 {
-  TQTable::endEdit(row, col, accept, tqreplace);
+  TQTable::endEdit(row, col, accept, replace);
 }
 */
 void KVocTrainTable::sortByColumn(int header, bool alpha) {

kvoctrain/kvoctrain/kvoctraintable.h

@@ -81,8 +81,8 @@ public:
 
   protected:
     int current;
-    //TQWidget* beginEdit(int row, int col, bool tqreplace);
+    //TQWidget* beginEdit(int row, int col, bool replace);
-    //void endEdit(int row, int col, bool accept, bool tqreplace);
+    //void endEdit(int row, int col, bool accept, bool replace);
     void paintCell(TQPainter *p, int row, int col, const TQRect &cr, bool selected, const TQColorGroup &cg);
     void setItem(int row, int col, TQTableItem * item);
     TQTableItem* item (int row, int col) const;

kvoctrain/kvoctrain/kvt-core/LineList.cpp

@@ -39,11 +39,11 @@ void LineList::setLines(const TQString &the_lines )
   multilines.clear();
   TQString lines = the_lines;
   int pos;
-  if ((pos = lines.tqfind ('\n')) >= 0) {
+  if ((pos = lines.find ('\n')) >= 0) {
     while (pos >= 0) {
       multilines.push_back(lines.left(pos));
       lines.remove (0, pos+1);
-      pos = lines.tqfind ('\n');
+      pos = lines.find ('\n');
     }
   }
 

kvoctrain/kvoctrain/kvt-core/QueryManager.cpp

@@ -93,7 +93,7 @@ TQString QueryManager::getSubType (const TQString & type)
 {
   int i;
   TQString t = type;
-  if ((i = t.tqfind(TQM_TYPE_DIV)) >= 0) {
+  if ((i = t.find(TQM_TYPE_DIV)) >= 0) {
     t.remove(0, i+1);
     return t;
   }
@@ -105,7 +105,7 @@ TQString QueryManager::getSubType (const TQString & type)
 TQString QueryManager::getMainType (const TQString & type)
 {
   int i;
-  if ((i = type.tqfind(TQM_TYPE_DIV)) >= 0)
+  if ((i = type.find(TQM_TYPE_DIV)) >= 0)
     return type.left(i);
   else
     return type;
@@ -238,7 +238,7 @@ QuerySelection QueryManager::select(kvoctrainDoc *doc, int act_lesson, int idx,
 bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, TQString query_type)
 {
    TQString qtype;
-   int pos = query_type.tqfind (TQM_TYPE_DIV);
+   int pos = query_type.find (TQM_TYPE_DIV);
    if (pos >= 0)
      qtype = query_type.left (pos);
    else
@@ -648,7 +648,7 @@ void QueryManager::setLessonItemStr (const TQString & indices)
   int pos;
   TQString indices_copy = indices;
   lessonitems.clear();
-  while ((pos = indices_copy.tqfind(' ')) >= 0) {
+  while ((pos = indices_copy.find(' ')) >= 0) {
      TQString s = indices_copy.left(pos);
      indices_copy.remove(0, pos+1);
      lessonitems.push_back(s.toInt());

kvoctrain/kvoctrain/kvt-core/UsageManager.cpp

@@ -135,11 +135,11 @@ vector<UsageRelation> UsageManager::getRelation ()
 }
 
 
-bool UsageManager::tqcontains (const TQString& label, const TQString& collection)
+bool UsageManager::contains (const TQString& label, const TQString& collection)
 {
    TQString s = collection;
    int pos;
-   while ((pos = s.tqfind(UL_USAGE_DIV)) >= 0) {
+   while ((pos = s.find(UL_USAGE_DIV)) >= 0) {
      if (s.left(pos) == label)
        return true;
      s.remove (0, pos+1);

kvoctrain/kvoctrain/kvt-core/UsageManager.h

@@ -114,7 +114,7 @@ class UsageManager
 
   UsageManager ();
 
-  static bool tqcontains (const TQString& label, const TQString& collection);
+  static bool contains (const TQString& label, const TQString& collection);
   static vector<UsageRelation> getRelation ();
   static void setUsageNames (vector<TQString> names);
 

kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp

@@ -93,7 +93,7 @@ Sachgebiete|
 static TQString extract (TQString &line)
 {
    TQString ret;
-   int lim = line.tqfind ("|");
+   int lim = line.find ("|");
    if (lim < 0) {
      ret = line;
      line = "";

kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp

@@ -347,7 +347,7 @@ bool kvoctrainDoc::extract_O_T_attr (
     else if ((*first).name () == KV_GRADE) {
       TQString s = (*first).stringValue();
 
-      if ((pos = s.tqfind(';')) >= 1) {
+      if ((pos = s.find(';')) >= 1) {
         grade = s.left(pos).toInt();
         rev_grade = s.mid(pos+1, s.length()).toInt();
       }
@@ -357,7 +357,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_COUNT) {
       TQString s = (*first).stringValue();
-      if ((pos = s.tqfind(';')) >= 1) {
+      if ((pos = s.find(';')) >= 1) {
         count = s.left(pos).toInt();
         rev_count = s.mid(pos+1, s.length()).toInt();
       }
@@ -367,7 +367,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_BAD) {
       TQString s = (*first).stringValue();
-      if ((pos = s.tqfind(';')) >= 1) {
+      if ((pos = s.find(';')) >= 1) {
         bcount = s.left(pos).toInt();
         rev_bcount = s.mid(pos+1, s.length()).toInt();
       } else
@@ -376,7 +376,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_DATE) {
       TQString s = (*first).stringValue();
-      if ((pos = s.tqfind(';')) >= 1) {
+      if ((pos = s.find(';')) >= 1) {
       date = s.left(pos).toInt();
       rev_date = s.mid(pos+1, s.length()).toInt();
       }
@@ -387,7 +387,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_DATE2) {
       TQString s = (*first).stringValue();
-      if ((pos = s.tqfind(';')) >= 1) {
+      if ((pos = s.find(';')) >= 1) {
         date = decompressDate (s.left(pos));
         rev_date = decompressDate (s.mid(pos+1, s.length()));
       }

kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp

@@ -103,7 +103,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is)
     }
     else if ((*first).name () == KV_GENERATOR) {
       generator = (*first).stringValue ();
-      int pos = generator.tqfindRev (KVD_VERS_PREFIX);
+      int pos = generator.findRev (KVD_VERS_PREFIX);
       if (pos >= 0) {
         doc_version = generator;
         doc_version.remove (0, pos+2);

kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp

@@ -124,13 +124,13 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
       size_t  odate = time(0),
               tdate = time(0);
 
-      int pos = s.tqfind (VCB_SEPARATOR);
+      int pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         o = s.left(pos);
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
-      pos = s.tqfind (VCB_SEPARATOR);
+      pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         t = s.left(pos);
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
@@ -139,19 +139,19 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
         t = s;
       }
 
-      pos = s.tqfind (VCB_SEPARATOR);
+      pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         ograde = s.left(pos).toInt();
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
-      pos = s.tqfind (VCB_SEPARATOR);
+      pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         tgrade = s.left(pos).toInt();
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
-      pos = s.tqfind (VCB_SEPARATOR);
+      pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         odate = s.left(pos).toInt();
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());

kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp

@@ -62,7 +62,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
   while (keepGoing)
   {
     temp = is.readLine();
-    keepGoing = !(temp.tqfind("\",") > 0);
+    keepGoing = !(temp.find("\",") > 0);
     title.append(temp);
     if (keepGoing)
       title.append(" ");
@@ -83,7 +83,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
 
   keepGoing = true;
   while (keepGoing)
-    keepGoing = !(is.readLine().tqfind("8. Lernhilfe") > 0); //DO NOT translate
+    keepGoing = !(is.readLine().find("8. Lernhilfe") > 0); //DO NOT translate
 
   for (i = 0; i <= 14; i++)
     is.readLine();
@@ -96,7 +96,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
     while (c < 2)
     {
       temp = is.readLine();
-      c+= temp.tqcontains("\",");
+      c+= temp.contains("\",");
       expression.append(temp);
       if (c < 2)
         expression.append(" ");

kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp

@@ -804,7 +804,7 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
 
     TQString s;
     TQString entype = s = (*first).getType(0);
-    int pos = s.tqfind (TQM_TYPE_DIV);
+    int pos = s.find (TQM_TYPE_DIV);
     if (pos >= 0)
       entype = s.left (pos);
     else
@@ -925,7 +925,7 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
 
       TQString s;
       TQString entype = s = (*first).getType(0);
-      int pos = s.tqfind (TQM_TYPE_DIV);
+      int pos = s.find (TQM_TYPE_DIV);
       if (pos >= 0)
         entype = s.left (pos);
       else

kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp

@@ -848,10 +848,10 @@ int kvoctrainDoc::search(TQString substr, int id,
 	{
 	 if (id == 0)
 	 {
-         	if (getEntry(i)->getOriginal().tqfind (substr, 0, false) == 0)  // case insensitive
+         	if (getEntry(i)->getOriginal().find (substr, 0, false) == 0)  // case insensitive
            	return i;
          } else {
-	 	if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) == 0) // case insensitive
+	 	if (getEntry(i)->getTranslation(id).find (substr, 0, false) == 0) // case insensitive
            	return i;
 	}
 	}	
@@ -861,10 +861,10 @@ int kvoctrainDoc::search(TQString substr, int id,
 
 	 if (id == 0)
 	 {
-         	if (getEntry(i)->getOriginal().tqfind (substr, 0, false) > -1)  // case insensitive
+         	if (getEntry(i)->getOriginal().find (substr, 0, false) > -1)  // case insensitive
            	return i;
          } else {
-	 	if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) > -1) // case insensitive
+	 	if (getEntry(i)->getTranslation(id).find (substr, 0, false) > -1) // case insensitive
            	return i;
 	}
        }
@@ -943,13 +943,13 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
    if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')
      return kvtml;
 
-   if (line.tqfind (VCB_SEPARATOR) >= 0)
+   if (line.find (VCB_SEPARATOR) >= 0)
      return vt_vcb;
 
    if (line == LEX_IDENT_50)
      return vt_lex;
 
-   if (c1 == '"' && (line.tqcontains('"') == 1 || line.tqcontains(TQRegExp("\",[0-9]"))))
+   if (c1 == '"' && (line.contains('"') == 1 || line.contains(TQRegExp("\",[0-9]"))))
      return vt_voc;
 
    return csv;

kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp

@@ -62,7 +62,7 @@ kvoctrainExpr::kvoctrainExpr (TQString &s, TQString separator, int _lesson)
   lesson = _lesson;
 
   if (separator.length() ) {
-    int pos = s.tqfind(separator);
+    int pos = s.find(separator);
 
     if (pos == -1) {
       setOriginal(s.stripWhiteSpace());
@@ -74,7 +74,7 @@ kvoctrainExpr::kvoctrainExpr (TQString &s, TQString separator, int _lesson)
 //      s.stripWhiteSpace();
 
       // gather all translations
-      while ((pos = s.tqfind(separator)) != -1) {
+      while ((pos = s.find(separator)) != -1) {
         se = s.left(pos).stripWhiteSpace();
         addTranslation(se, KV_NORM_GRADE, KV_NORM_GRADE);
         s.remove (0, pos+separator.length() );

kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp

@@ -208,31 +208,31 @@ bool XmlReader::readAttributes (std::list<XmlAttribute>& attrib_list) {
           // un-escape dangerous characters in reverted order
           KOXML_STRING val = tokenizer.element();
           int pos = 0;
-          while ((pos = val.tqfind("&quot;", pos)) >= 0) {
+          while ((pos = val.find("&quot;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 6);
             KOXML_STRING_INSERT( val, pos, "\"");
             pos += 1; // skip "
           }
           pos = 0;
-          while ((pos = val.tqfind("&lf;", pos)) >= 0) {
+          while ((pos = val.find("&lf;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 4);
             KOXML_STRING_INSERT( val, pos, "\r");
             pos += 1; // skip \r
           }
           pos = 0;
-          while ((pos = val.tqfind("&nl;", pos)) >= 0) {
+          while ((pos = val.find("&nl;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 4);
             KOXML_STRING_INSERT( val, pos, "\n");
             pos += 1; // skip \n
           }
           pos = 0;
-          while ((pos = val.tqfind("&lt;", pos)) >= 0) {
+          while ((pos = val.find("&lt;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 4);
             KOXML_STRING_INSERT( val, pos, "<");
             pos += 1; // skip <
           }
           pos = 0;
-          while ((pos = val.tqfind ("&amp;", pos)) >= 0) {
+          while ((pos = val.find ("&amp;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos+1, 4);
             pos += 1; // skip &
           }

kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp

@@ -116,30 +116,30 @@ void XmlWriter::addAttribute (KOXML_STRING name, const KOXML_STRING& value)
   KOXML_STRING val = value;
   // escape dangerous characters in sgml-style
   int pos = 0;
-  while ((pos = val.tqfind ('&', pos)) >= 0) {
+  while ((pos = val.find ('&', pos)) >= 0) {
     KOXML_STRING_INSERT( val, pos+1, "amp;");
     pos += 5; // skip &
   }
   pos = 0;
-  while ((pos = val.tqfind ('<', pos)) >= 0) {
+  while ((pos = val.find ('<', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos, "&lt;");
     pos += 4; // skip &nl;
   }
   pos = 0;
-  while ((pos = val.tqfind ('\n', pos)) >= 0) {
+  while ((pos = val.find ('\n', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos, "&nl;");
     pos += 4; // skip &nl;
   }
   pos = 0;
-  while ((pos = val.tqfind ('\r', pos)) >= 0) {
+  while ((pos = val.find ('\r', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos+1, "lf;");
     pos += 4; // skip &lf;
   }
   pos = 0;
-  while ((pos = val.tqfind ('\"', pos)) >= 0) {
+  while ((pos = val.find ('\"', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos, "&quot;");
     pos += 6; // skip &qout;

kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp

@@ -115,11 +115,11 @@ void ArtQueryDlg::setQuery(TQString,
    articles.female(def, indef);
    mw->rb_fem->setText (i18n("&female:\t")+def+" / "+indef);
    mw->rb_fem->setEnabled (!TQString(def+indef).isEmpty() );
-   if (!removed && s.tqfind(def+" ") == 0) {
+   if (!removed && s.find(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.tqfind(indef+" ") == 0) {
+   if (!removed && s.find(indef+" ") == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
@@ -127,11 +127,11 @@ void ArtQueryDlg::setQuery(TQString,
    articles.male(def, indef);
    mw->male->setText (i18n("&male:\t")+def+" / "+indef);
    mw->male->setEnabled (!TQString(def+indef).isEmpty() );
-   if (!removed && s.tqfind(def+" ") == 0) {
+   if (!removed && s.find(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.tqfind(indef+" ") == 0) {
+   if (!removed && s.find(indef+" ") == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
@@ -139,11 +139,11 @@ void ArtQueryDlg::setQuery(TQString,
    articles.natural(def, indef);
    mw->natural->setText (i18n("&natural:\t")+def+" / "+indef);
    mw->natural->setEnabled (!TQString(def+indef).isEmpty() );
-   if (!removed && s.tqfind(def+" ") == 0) {
+   if (!removed && s.find(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.tqfind(indef+" ") == 0) {
+   if (!removed && s.find(indef+" ") == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }

kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp

@@ -651,7 +651,7 @@ void RandomQueryDlg::keyPressEvent( TQKeyEvent *e )
           {
             TQString trans (vocabulary[i]);
             if ( (e -> key() == Key_F5 && trans.tqstartsWith (curText, false)
-                || e -> key() == Key_F6 && trans.tqcontains (curText, false)) )
+                || e -> key() == Key_F6 && trans.contains (curText, false)) )
               combo -> insertItem (trans);
           }
           combo -> setEditText (curText);

kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp

@@ -145,7 +145,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
        s = exp->getExample(column);
        answerstring = column == 0 ? exp->getOriginal().stripWhiteSpace() : exp->getTranslation(column).stripWhiteSpace();
        int pos = -1;
-       while ((pos = s.tqfind(answerstring)) > 0)
+       while ((pos = s.find(answerstring)) > 0)
        {
          s.remove(pos, answerstring.length());
          s.insert (pos, "..");

kvoctrain/kvoctrain/spotlight2kvtml.cpp

@@ -96,7 +96,7 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
      line = is.readLine();
 
      int pos;
-     while ((pos = line.tqfind("  ")) >= 0)
+     while ((pos = line.find("  ")) >= 0)
        line.remove (pos, 1);
 
      bool head_line = (!line.stripWhiteSpace().isEmpty() && line == line.upper() );
@@ -107,32 +107,32 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
      }
      first_line = false;
 
-     if (   line.tqfind ("see p.") >= 0
+     if (   line.find ("see p.") >= 0
-         || line.tqfind ("see pp.") >= 0
+         || line.find ("see pp.") >= 0
-         || line.tqfind ("see also p") >= 0) {
+         || line.find ("see also p") >= 0) {
        line = "";
      }
 
      int c = 0x92;
-     while ((pos = line.tqfind (c)) >= 0)
+     while ((pos = line.find (c)) >= 0)
        line[pos] = '\'';
 
      c = 0x94;
-     while ((pos = line.tqfind (c)) >= 0)
+     while ((pos = line.find (c)) >= 0)
        line[pos] = ' ';
 
      pos = 0;
-     while ((pos = line.tqfind ('&', pos)) >= 0) {
+     while ((pos = line.find ('&', pos)) >= 0) {
        line.insert (pos+1, "amp;");
        pos += 5; // skip &
      }
 
-     while ((pos = line.tqfind ('<')) >= 0) {
+     while ((pos = line.find ('<')) >= 0) {
        line.remove(pos, 1);
        line.insert (pos, "&lt;");
      }
 
-     while ((pos = line.tqfind ('>')) >= 0) {
+     while ((pos = line.find ('>')) >= 0) {
        line.remove(pos, 1);
        line.insert (pos, "&gt;");
      }
@@ -144,9 +144,9 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
          lesson_str = line + ", "+month+" "+year;
        }
        else {
-         pos = line.tqfind ('\t');
+         pos = line.find ('\t');
          if (pos < 0)
-           pos = line.tqfind ('|');
+           pos = line.find ('|');
          if (pos >= 0) {
            if (lesson_pending) {
              lesson_pending = false;
@@ -166,47 +166,47 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
            spot.en = line.mid(0, pos);
            spot.de = line.mid(pos+1, line.length()-pos-1);
 
-           if ((pos = spot.en.tqfind(" UK") ) >= 0) {
+           if ((pos = spot.en.find(" UK") ) >= 0) {
              spot.en_rem+= i18n("UK ").local8Bit();
              spot.en.remove (pos, 3);
            }
-           if ((pos = spot.en.tqfind("(UK)") ) >= 0) {
+           if ((pos = spot.en.find("(UK)") ) >= 0) {
              spot.en_rem+= i18n("UK ").local8Bit();
              spot.en.remove (pos, 4);
            }
 
-           if ((pos = spot.en.tqfind(" N. Am.") ) >= 0) {
+           if ((pos = spot.en.find(" N. Am.") ) >= 0) {
              spot.en_rem+= i18n("N. Am. ").local8Bit();
              spot.en.remove (pos, 7);
            }
-           if ((pos = spot.en.tqfind("(N. Am.)") ) >= 0) {
+           if ((pos = spot.en.find("(N. Am.)") ) >= 0) {
              spot.en_rem+= i18n("N. Am. ").local8Bit();
              spot.en.remove (pos, 8);
            }
 
-           if ((pos = spot.en.tqfind(" US") ) >= 0) {
+           if ((pos = spot.en.find(" US") ) >= 0) {
              spot.en_rem+= i18n("US ").local8Bit();
              spot.en.remove (pos, 3);
            }
-           if ((pos = spot.en.tqfind("(US)") ) >= 0) {
+           if ((pos = spot.en.find("(US)") ) >= 0) {
              spot.en_rem+= i18n("US ").local8Bit();
              spot.en.remove (pos, 4);
            }
 
-           if ((pos = spot.en.tqfind("ifml.") ) >= 0) {
+           if ((pos = spot.en.find("ifml.") ) >= 0) {
              spot.en_rem+= i18n("ifml. ").local8Bit();
              spot.en.remove (pos, 5);
            }
-           if ((pos = spot.en.tqfind("(ifml.)") ) >= 0) {
+           if ((pos = spot.en.find("(ifml.)") ) >= 0) {
              spot.en_rem+= i18n("ifml. ").local8Bit();
              spot.en.remove (pos, 7);
            }
 
-           if ((pos = spot.en.tqfind("vulg.") ) >= 0) {
+           if ((pos = spot.en.find("vulg.") ) >= 0) {
              spot.en_rem+= i18n("vulg. ").local8Bit();
              spot.en.remove (pos, 5);
            }
-           if ((pos = spot.en.tqfind("(vulg.)") ) >= 0) {
+           if ((pos = spot.en.find("(vulg.)") ) >= 0) {
              spot.en_rem+= i18n("vulg. ").local8Bit();
              spot.en.remove (pos, 7);
            }
@@ -311,7 +311,7 @@ int main(int argc, char **argv)
   TQString spot (argv[1]);
   TQString kvtml;
 
-  int dot = spot.tqfindRev('.');
+  int dot = spot.findRev('.');
   if (dot < 0) {
     kvtml = spot + "." KVTML_EXT;
   }

kvoctrain/kvoctrain/tools/extractlang.cpp

@@ -19,19 +19,19 @@ TQString threeLangs;
 
 void parseLanguage(TQString name, TQString three, TQString two)
 {
-  int star = three.tqfind('*');
+  int star = three.find('*');
   if (star > 0)
     three.remove(star, 1);
 
   TQString three_1 = three;
 
-  int slash = three_1.tqfind('/');
+  int slash = three_1.find('/');
   if (slash > 0) {
     three_1.remove(slash, 1);
     three_1.insert(slash, ", ");
   }
 
-  if (!two.tqcontains(" ")) {
+  if (!two.contains(" ")) {
       twoLangs.append("\t{{\"");
       twoLangs.append(two);
       twoLangs.append("\"}, {\"");
@@ -43,7 +43,7 @@ void parseLanguage(TQString name, TQString three, TQString two)
   else
     two = "";
 
-  slash = three.tqfind('/');
+  slash = three.find('/');
   if (slash > 0) {
     if (two.length() == 0)
       two = three.mid(slash+1);
@@ -96,7 +96,7 @@ bool parseTR(TQString& line, TQTextIStream& in)
 
 
   uint count = 0;
-  while (line.tqcontains("<td"))
+  while (line.contains("<td"))
     { 
       if (count > 3)
 	return true;
@@ -111,7 +111,7 @@ bool parseTR(TQString& line, TQTextIStream& in)
       parseLanguage(text[0], text[2], text[3]);
     }
 
-  if (line.tqcontains("/tr"))
+  if (line.contains("/tr"))
     return true;
 
   return false;
@@ -130,7 +130,7 @@ int main()
       if (readNext)
 	line = in.readLine();
 
-      if (line.tqcontains("<tr"))
+      if (line.contains("<tr"))
 	{
 	  readNext = parseTR(line, in);
 	}

kwordquiz/src/kvtmlwriter.cpp

@@ -81,9 +81,9 @@ KVTMLWriter::~KVTMLWriter()
 TQString KVTMLWriter::escape( const TQString & s)
 {
   TQString result = s;
-  result.tqreplace(TQChar('&'), "&"); //must be done first 
+  result.replace(TQChar('&'), "&"); //must be done first 
-  result.tqreplace(TQChar('<'), "&lt;");
+  result.replace(TQChar('<'), "&lt;");
-  result.tqreplace(TQChar('>'), "&gt;");
+  result.replace(TQChar('>'), "&gt;");
 
   return result;  
 }

kwordquiz/src/kwordquiz.cpp

@@ -175,7 +175,7 @@ void KWordQuizApp::initActions()
   editUnmarkBlank->setWhatsThis(i18n("Removes blanks from the current or selected word"));
   editUnmarkBlank->setToolTip(editUnmarkBlank->whatsThis());
 
-  //@todo implement editFind = KStdAction::tqfind(this, TQT_SLOT(slotEditFind()), actionCollection());
+  //@todo implement editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), actionCollection());
 
   vocabLanguages = new KAction(i18n("&Column Titles..."), "languages", "CTRL+L", TQT_TQOBJECT(this), TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages");
   vocabLanguages->setWhatsThis(i18n("Defines the column titles for the active vocabulary"));
@@ -595,7 +595,7 @@ bool KWordQuizApp::saveAsFileName( )
     if(!url.isEmpty()){
 
       //@todo check that a valid extension was really given
-      if (!url.fileName().tqcontains('.'))
+      if (!url.fileName().contains('.'))
       {
         if  (fd->currentFilter() == "*.wql")
           url = KURL(url.path() + ".wql");

kwordquiz/src/kwordquizview.cpp

@@ -284,16 +284,16 @@ bool KWordQuizView::gridIsEmpty()
   return true;
 }
 
-TQWidget * KWordQuizView::beginEdit( int row, int col, bool tqreplace )
+TQWidget * KWordQuizView::beginEdit( int row, int col, bool replace )
 {
   m_currentText = text(row, col);
-  cellEditor = TQTable::beginEdit(row, col, tqreplace);
+  cellEditor = TQTable::beginEdit(row, col, replace);
   if (cellEditor)
     cellEditor->installEventFilter(this);
   return cellEditor;
 }
 
-void KWordQuizView::endEdit( int row, int col, bool accept, bool tqreplace )
+void KWordQuizView::endEdit( int row, int col, bool accept, bool replace )
 {
   // this code gets called after enter and arrow keys, now we
   // only process if editing really has been done
@@ -302,7 +302,7 @@ void KWordQuizView::endEdit( int row, int col, bool accept, bool tqreplace )
   {
     if (((TQLineEdit *) cellWidget(row, col))->text() != m_currentText)
       addUndo(i18n("&Undo Entry"));
-    TQTable::endEdit(row, col, accept, tqreplace); //this will destroy the cellWidget
+    TQTable::endEdit(row, col, accept, replace); //this will destroy the cellWidget
     if (!text(row, col).isEmpty())
     {
       TQTableItem* itm;
@@ -472,7 +472,7 @@ void KWordQuizView::doEditPaste( )
         br= br + sl.count() - 1;
 
       if (lc == 0) //left col?
-        if (sl[0].tqfind("\t") < ((int) sl[0].length() - 1))
+        if (sl[0].find("\t") < ((int) sl[0].length() - 1))
           rc = 1; //expand to second column;
 
       uint i = 0;
@@ -666,7 +666,7 @@ void KWordQuizView::doEditMarkBlank( )
         st = st.prepend(delim_start);
         st = st.append(delim_end);
         int ss = l->selectionStart();
-        s = s.tqreplace(ss, len, st);
+        s = s.replace(ss, len, st);
         l->setText(s);
         l->setSelection(ss, st.length());
       }
@@ -691,7 +691,7 @@ void KWordQuizView::doEditUnmarkBlank( )
       s.remove(delim_start);
       s.remove(delim_end);
       int ss = l->selectionStart();
-      ls = ls.tqreplace(ss, len, s);
+      ls = ls.replace(ss, len, s);
       l->setText(ls);
       l->setSelection(ss, s.length());
     }
@@ -702,15 +702,15 @@ void KWordQuizView::doEditUnmarkBlank( )
         s = l->text();
         int cs = l->cursorPosition();
 
-        int fr = s.tqfindRev(delim_start, cs);
+        int fr = s.findRev(delim_start, cs);
         if (fr > 0)
         {
-          s = s.tqreplace(fr, 1, "");
+          s = s.replace(fr, 1, "");
           cs--;
         }
-        int ff = s.tqfind(delim_end, cs);
+        int ff = s.find(delim_end, cs);
         if (ff > 0)
-          s = s.tqreplace(ff, 1, "");
+          s = s.replace(ff, 1, "");
 
         l->setText(s);
         l->setCursorPosition(cs);
@@ -870,7 +870,7 @@ void KWordQuizView::slotSpecChar(const TQChar & c)
       TQString s = l->selectedText();
       int len = s.length();
       int ss = l->selectionStart();
-      ls = ls.tqreplace(ss, len, c);
+      ls = ls.replace(ss, len, c);
       l->setText(ls);
       l->setSelection(ss, 1);
     }

kwordquiz/src/kwordquizview.h

@@ -90,8 +90,8 @@ class KWordQuizView : public TQTable
     bool checkSyntax(bool all, bool blanks);
     void saveCurrentSelection(bool clear);
   protected:
-    TQWidget * beginEdit(int row, int col, bool tqreplace);
+    TQWidget * beginEdit(int row, int col, bool replace);
-    void endEdit ( int row, int col, bool accept, bool tqreplace );
+    void endEdit ( int row, int col, bool accept, bool replace );
     void activateNextCell();
     void keyPressEvent( TQKeyEvent* );
     bool eventFilter( TQObject*, TQEvent* );

kwordquiz/src/qaview.cpp

@@ -311,7 +311,7 @@ void QAView::slotSpecChar( const TQChar & c)
       TQString s = txtAnswer->selectedText();
       int len = s.length();
       int ss = txtAnswer->selectionStart();
-      ls = ls.tqreplace(ss, len, c);
+      ls = ls.replace(ss, len, c);
       txtAnswer->setText(ls);
       txtAnswer->setSelection(ss, 1);
     }

kwordquiz/src/wqlreader.cpp

@@ -75,18 +75,18 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName)
 
     while (ts.readLine() != "[Font Info]");
     s = ts.readLine();
-    int p = s.tqfind("=", 0);
+    int p = s.find("=", 0);
     TQString fam = s.right(s.length() - (p + 1));
     fam = fam.mid(1, fam.length() - 2);
     //g->font().setFamily(s);
 
     s = ts.readLine();
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     s = s.right(s.length() - (p + 1));
     int ps = s.toInt(0);
 
     s = ts.readLine();
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     s = s.right(s.length() - (p + 1));
     int b = 0;
     if (s == "1")
@@ -95,7 +95,7 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName)
     }
 
     s = ts.readLine();
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     s = s.right(s.length() - (p + 1));
     bool it = (s == "1");
 
@@ -103,52 +103,52 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName)
 
     while (ts.readLine() != "[Character Info]");  
     s = ts.readLine();    
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     m_specialCharacters = s.right(s.length() - (p + 1));
 
     while (ts.readLine() != "[Grid Info]");
     ts.readLine(); //skip value for width of row headers
 
     s = ts.readLine();
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     s = s.right(s.length() - (p + 1));
     m_colWidth1 = s.toInt(0, 10);
 
     s = ts.readLine();
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     s = s.right(s.length() - (p + 1));
     m_colWidth2 = s.toInt(0, 10);
 
     s = ts.readLine();
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     s = s.right(s.length() - (p + 1));
     m_numRows = (s.toInt(0, 10) - 1); //We need to reduce by one since the header is not included
 
     // Selection
     s = ts.readLine();
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     s = s.right(s.length() - (p + 1));
     m_topLeft =s.toInt(0, 10) - 1;
 
     s = ts.readLine();
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     s = s.right(s.length() - (p + 1));
     m_topRight =s.toInt(0, 10) - 1;
 
     s = ts.readLine();
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     s = s.right(s.length() - (p + 1));
     m_bottomLeft =s.toInt(0, 10) - 1;
 
     s = ts.readLine();
-    p = s.tqfind("=", 0);
+    p = s.find("=", 0);
     s = s.right(s.length() - (p + 1));
     m_bottomRight =s.toInt(0, 10) - 1 ;
 
     while (ts.readLine() != "[Vocabulary]");
 
     s = ts.readLine();
-    p = s.tqfind("   [", 0);
+    p = s.find("   [", 0);
     s = s.left(p);
     s = s.stripWhiteSpace();
     m_language1 = s;
@@ -157,7 +157,7 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName)
     while (!s.isNull())
     {
       s = ts.readLine();
-      p = s.tqfind("[", 0);
+      p = s.find("[", 0);
       TQString r = s.mid(p + 1, 10);
       int h = r.toInt(0, 10);
       s = s.left(p);

kwordquiz/src/wqquiz.cpp

@@ -239,12 +239,12 @@ bool WQQuiz::checkAnswer(int i, const TQString & a)
     if (TQString(m_correctBlank).length() > 0)
     {
       TQStringList la, ls;
-      if (ans.tqfind(";") > 0)
+      if (ans.find(";") > 0)
         ls = TQStringList::split(";", ans);
       else
         ls.append(ans);
 
-      if (m_correctBlank.tqfind(";") > 0)
+      if (m_correctBlank.find(";") > 0)
         la = TQStringList::split(";", m_correctBlank);
       else
         la.append(m_correctBlank);
@@ -377,17 +377,17 @@ TQString WQQuiz::yourAnswer(int i, const TQString & s)
   {
     TQStringList ls;
 
-    if (s.tqfind(";") > 0)
+    if (s.find(";") > 0)
       ls = TQStringList::split(";", s, true);
     else
       ls.append(s);
 
-    result = m_answerBlank.tqreplace("..........", "<u></u>");
+    result = m_answerBlank.replace("..........", "<u></u>");
 
     int offset = 0, counter = 0;
     while (offset >= 0)
     {
-      offset = result.tqfind("<u>", offset);
+      offset = result.find("<u>", offset);
       if (offset >= 0)
       {
         result.insert(offset + 3, ls[counter]);
@@ -474,7 +474,7 @@ TQString WQQuiz::blankAnswer(int i)
     rx.setMinimal(true);
     rx.setPattern("\\[.*\\]");
 
-    r.tqreplace(rx, "..........");
+    r.replace(rx, "..........");
 
     if (r != tTemp)
     {
@@ -486,9 +486,9 @@ TQString WQQuiz::blankAnswer(int i)
         if (offset >= 0)
         {
           if (m_correctBlank.length() > 0)
-            m_correctBlank = m_correctBlank + ";" + " " + tTemp.mid(offset + 1, tTemp.tqfind(']', offset) - offset - 1);
+            m_correctBlank = m_correctBlank + ";" + " " + tTemp.mid(offset + 1, tTemp.find(']', offset) - offset - 1);
           else
-            m_correctBlank = tTemp.mid(offset + 1, tTemp.tqfind(']', offset) - offset - 1);
+            m_correctBlank = tTemp.mid(offset + 1, tTemp.find(']', offset) - offset - 1);
           offset++; 
         }
       }
@@ -517,8 +517,8 @@ TQString WQQuiz::answer(int i)
     s = m_table->text(li.oneOp(), j);
     if (Prefs::enableBlanks())
     {
-      s.tqreplace("[", "<u>");
+      s.replace("[", "<u>");
-      s.tqreplace("]", "</u>");
+      s.replace("]", "</u>");
       s.prepend("<qt>");
       s.append("</qt>");
     }

libkdeedu/extdate/extdatetbl.cpp

@@ -554,7 +554,7 @@ void ExtDateTable::setCustomDatePainting(const ExtDate &date, const TQColor &fgC
     mode->fgColor=fgColor;
     mode->bgColor=bgColor;
 
-    d->customPaintingModes.tqreplace( date.toString(), mode );
+    d->customPaintingModes.replace( date.toString(), mode );
     d->useCustomColors=true;
     update();
 }

libkdeedu/extdate/extdatetime.cpp

@@ -293,16 +293,16 @@ TQString ExtDate::toString( const TQString& format ) const
 
 	TQString result( format );
 
-	result.tqreplace( "%Y", TQString().sprintf( "%d", year() ) );
+	result.replace( "%Y", TQString().sprintf( "%d", year() ) );
-	result.tqreplace( "%y", TQString().sprintf( "%02d", (year() % 100) ) );
+	result.replace( "%y", TQString().sprintf( "%02d", (year() % 100) ) );
-	result.tqreplace( "%n", TQString().sprintf( "%d", month() ) );
+	result.replace( "%n", TQString().sprintf( "%d", month() ) );
-	result.tqreplace( "%m", TQString().sprintf( "%02d", month() ) );
+	result.replace( "%m", TQString().sprintf( "%02d", month() ) );
-	result.tqreplace( "%e", TQString().sprintf( "%d", day() ) );
+	result.replace( "%e", TQString().sprintf( "%d", day() ) );
-	result.tqreplace( "%d", TQString().sprintf( "%02d", day() ) );
+	result.replace( "%d", TQString().sprintf( "%02d", day() ) );
-	result.tqreplace( "%b", shortMonthName( month() ) );
+	result.replace( "%b", shortMonthName( month() ) );
-	result.tqreplace( "%B", longMonthName( month() ) );
+	result.replace( "%B", longMonthName( month() ) );
-	result.tqreplace( "%a", shortDayName( dayOfWeek() ) );
+	result.replace( "%a", shortDayName( dayOfWeek() ) );
-	result.tqreplace( "%A", longDayName( dayOfWeek() ) );
+	result.replace( "%A", longDayName( dayOfWeek() ) );
 
 	return result;
 }
@@ -833,13 +833,13 @@ TQString ExtDateTime::toString( const TQString& format ) const
 
 	int h = time().hour();
 
-	result.tqreplace( "%H", TQString().sprintf( "%02d", h ) );
+	result.replace( "%H", TQString().sprintf( "%02d", h ) );
-	result.tqreplace( "%k", TQString().sprintf( "%d", h ) );
+	result.replace( "%k", TQString().sprintf( "%d", h ) );
-	result.tqreplace( "%I", TQString().sprintf( "%02d", ( h > 12 ) ? h-12 : h ) );
+	result.replace( "%I", TQString().sprintf( "%02d", ( h > 12 ) ? h-12 : h ) );
-	result.tqreplace( "%l", TQString().sprintf( "%d", ( h > 12 ) ? h-12 : h ) );
+	result.replace( "%l", TQString().sprintf( "%d", ( h > 12 ) ? h-12 : h ) );
-	result.tqreplace( "%M", TQString().sprintf( "%02d", time().minute() ) );
+	result.replace( "%M", TQString().sprintf( "%02d", time().minute() ) );
-	result.tqreplace( "%S", TQString().sprintf( "%02d", time().second() ) );
+	result.replace( "%S", TQString().sprintf( "%02d", time().second() ) );
-	result.tqreplace( "%p", TQString().sprintf( "%s", ( h > 12 ) ? "pm" : "am" ) );
+	result.replace( "%p", TQString().sprintf( "%s", ( h > 12 ) ? "pm" : "am" ) );
 
 	return result;
 }
@@ -1084,7 +1084,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f )
 	}
 
 	if ( f == Qt::ISODate ) {
-		if ( s.length() <= 10 || ! s.tqcontains( ':' )  ) { //no time specified
+		if ( s.length() <= 10 || ! s.contains( ':' )  ) { //no time specified
 			TQTime t = TQTime(0,0,0);
 			return ExtDateTime( ExtDate::fromString( s.mid(0,10), Qt::ISODate ) );
 		} else {
@@ -1099,7 +1099,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f )
 		TQTime time;
 		TQString sd = s;
 		int hour, minute, second;
-		int pivot = s.tqfind( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
+		int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
 		if ( pivot != -1 ) {
 			hour = s.mid( pivot, 2 ).toInt();
 			minute = s.mid( pivot+3, 2 ).toInt();

libkdeedu/extdate/extdatetimeedit.cpp

@@ -113,9 +113,9 @@ static void readLocaleSettings()
     *lTimeSep = ":";
 #endif
     TQString d = ExtDate( 1999, 11, 22 ).toString( Qt::LocalDate );
-    dpos = d.tqfind( "22" );
+    dpos = d.find( "22" );
-    mpos = d.tqfind( "11" );
+    mpos = d.find( "11" );
-    ypos = d.tqfind( "99" );
+    ypos = d.find( "99" );
     if ( dpos > -1 && mpos > -1 && ypos > -1 ) {
 	// test for DMY, MDY, YMD, YDM
 	if ( dpos < mpos && mpos < ypos ) {
@@ -135,7 +135,7 @@ static void readLocaleSettings()
 
 #ifndef TQ_WS_WIN
 	TQString sep = d.mid( TQMIN( dpos, mpos ) + 2, TQABS( dpos - mpos ) - 2 );
-	if ( d.tqcontains( sep ) == 2 ) {
+	if ( d.contains( sep ) == 2 ) {
 	    *lDateSep = sep;
 	}
 #endif
@@ -143,9 +143,9 @@ static void readLocaleSettings()
 
 #ifndef TQ_WS_WIN
     TQString t = TQTime( 11, 22, 33 ).toString( Qt::LocalDate );
-    dpos = t.tqfind( "11" );
+    dpos = t.find( "11" );
-    mpos = t.tqfind( "22" );
+    mpos = t.find( "22" );
-    ypos = t.tqfind( "33" );
+    ypos = t.find( "33" );
     // We only allow hhmmss
     if ( dpos > -1 && dpos < mpos && mpos < ypos ) {
 	TQString sep = t.mid( dpos + 2, mpos - dpos - 2 );

libkdeedu/kdeeduplot/kplotwidget.h

@@ -100,7 +100,7 @@ public:
 		*@param i the index of th item to be replaced
 		*@param o pointer to the replacement KPlotObject
 		*/
-	virtual void replaceObject( int i, KPlotObject *o ) { ObjectList.tqreplace( i, o ); }
+	virtual void replaceObject( int i, KPlotObject *o ) { ObjectList.replace( i, o ); }
 
 	/**@return the number of KPlotObjects in the list
 		*/

libkdeedu/kdeeduui/kdeeduglossary.cpp

@@ -100,8 +100,8 @@ void Glossary::fixImagePath()
 
 	for ( ; it != itEnd ; ++it )
 	{
-		( *it )->setDesc( ( *it )->desc().tqreplace("[img]", firstpart ) );
+		( *it )->setDesc( ( *it )->desc().replace("[img]", firstpart ) );
-		( *it )->setDesc( ( *it )->desc().tqreplace("[/img]", "\" />" ) );
+		( *it )->setDesc( ( *it )->desc().replace("[/img]", "\" />" ) );
 	}
 }
 	
@@ -136,15 +136,15 @@ TQValueList<GlossaryItem*> Glossary::readItems( TQDomDocument &itemDocument )
 
 		item->setName( i18n( nameNode.toElement( ).text().utf8() ) );
 		
-		item->setDesc( desc.tqreplace("[b]", "<b>" ) );
+		item->setDesc( desc.replace("[b]", "<b>" ) );
-		item->setDesc( item->desc().tqreplace("[/b]", "</b>" ) );
+		item->setDesc( item->desc().replace("[/b]", "</b>" ) );
-		item->setDesc( item->desc().tqreplace("[i]", "<i>" ) );
+		item->setDesc( item->desc().replace("[i]", "<i>" ) );
-		item->setDesc( item->desc().tqreplace("[/i]", "</i>" ) );
+		item->setDesc( item->desc().replace("[/i]", "</i>" ) );
-		item->setDesc( item->desc().tqreplace("[sub]", "<sub>" ) );
+		item->setDesc( item->desc().replace("[sub]", "<sub>" ) );
-		item->setDesc( item->desc().tqreplace("[/sub]", "</sub>" ) );
+		item->setDesc( item->desc().replace("[/sub]", "</sub>" ) );
-		item->setDesc( item->desc().tqreplace("[sup]", "<sup>" ) );
+		item->setDesc( item->desc().replace("[sup]", "<sup>" ) );
-		item->setDesc( item->desc().tqreplace("[/sup]", "</sup>" ) );
+		item->setDesc( item->desc().replace("[/sup]", "</sup>" ) );
-		item->setDesc( item->desc().tqreplace("[br]", "<br />" ) );
+		item->setDesc( item->desc().replace("[br]", "<br />" ) );
 		
 		refNodeList = refNode.elementsByTagName( "refitem" );
 		for ( uint it = 0; it < refNodeList.count(); it++ )