Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

blinken/src/highscoredialog.cpp

@@ -136,7 +136,7 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true
 		cfg -> setGroup(TQString("Level%1").arg(i));
 		for (int j = 1; j <= 5; j++)
 		{
-			m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j))));
+			m_scores[i-1].append(qMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j))));
 		}
 	}
 	
@@ -166,7 +166,7 @@ void highScoreDialog::addScore(int level, int score, const TQString &name)
 	
 	if (it != itEnd)
 	{
-		m_scores[level].insert(it, tqMakePair(score, name));
+		m_scores[level].insert(it, qMakePair(score, name));
 		m_scores[level].remove(--m_scores[level].end());
 		
 		TDEConfig *cfg = kapp -> config();

keduca/keduca/kcheckeduca.cpp

@@ -80,6 +80,6 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
         br.setBottom( br.bottom()+2);
         br = br.intersect( TQRect(0,0,rw, rh+yo ) );
 
-        style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
+        style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
     }
 }

keduca/keduca/tderadioeduca.cpp

@@ -78,6 +78,6 @@ void TDERadioEduca::drawButtonLabel( TQPainter *p)
         br.setTop( br.top()-2 );
         br.setBottom( br.bottom()+2);
         br = br.intersect( TQRect(0,0,rw, rh+yo ) );
-        style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
+        style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
     }
 }

kiten/main.cpp

@@ -39,7 +39,7 @@ static TDECmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-	tqInstallMsgHandler(noMessageOutput);
+	qInstallMsgHandler(noMessageOutput);
 	TDEAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
 	  "1.2", I18N_NOOP("Japanese Reference Tool"), TDEAboutData::License_GPL,
 	  "(c) 2001-2004, Jason Katz-Brown", 0, "http://www.katzbrown.com/kiten");

klatin/klatin/klatinvocab.cpp

@@ -123,9 +123,9 @@ void KLatinVocab::parseVocab(TQString customFile)
 	// Start parsing file and allocating words to the TQValueList<TQStringPair>
 	for(KEduVocDataItemList::Iterator dataIt = vocabulary.begin(); dataIt != vocabulary.end(); ++dataIt) {
 		if (Settings::langToLatin()) {
-			m_texts.append(tqMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText()));
+			m_texts.append(qMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText()));
 		} else {
-			m_texts.append(tqMakePair(vocabulary[it].translatedText(), vocabulary[it].originalText()));
+			m_texts.append(qMakePair(vocabulary[it].translatedText(), vocabulary[it].originalText()));
 		}
 		it++;
 	}

libtdeedu/extdate/extdatepicker.cpp

@@ -490,7 +490,7 @@ ExtDatePicker::setFontSize(int s)
       maxMonthRect.setHeight(TQMAX(r.height(),  maxMonthRect.height()));
     }
 
-  TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton,
+  TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton,
                                                selectMonth,
                                                maxMonthRect);
   selectMonth->setMinimumSize(metricBound);