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

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

bibletime/frontend/cinfodisplay.cpp

@@ -97,7 +97,7 @@ namespace InfoDisplay {
 
 	void CInfoDisplay::setInfo(const InfoType type, const TQString& data) {
 		ListInfoData list;
-		list.append( tqMakePair(type, data) );
+		list.append( qMakePair(type, data) );
 
 		setInfo(list);
 	}

bibletime/frontend/display/chtmlreaddisplay.cpp

@@ -378,27 +378,27 @@ void CHTMLReadDisplay::timerEvent( TQTimerEvent *e ) {
 			if (!currentNode.isNull() && (currentNode.nodeType() == DOM::Node::ELEMENT_NODE) && currentNode.hasAttributes()) { //found right node
 				attr = currentNode.attributes().getNamedItem("note");
 				if (!attr.isNull()) {
-					infoList.append( tqMakePair(CInfoDisplay::Footnote, attr.nodeValue().string()) );
+					infoList.append( qMakePair(CInfoDisplay::Footnote, attr.nodeValue().string()) );
 				}
 	
 				attr = currentNode.attributes().getNamedItem("lemma");
 				if (!attr.isNull()) {
-					infoList.append( tqMakePair(CInfoDisplay::Lemma, attr.nodeValue().string()) );
+					infoList.append( qMakePair(CInfoDisplay::Lemma, attr.nodeValue().string()) );
 				}
 	
 				attr = currentNode.attributes().getNamedItem("morph");
 				if (!attr.isNull()) {
-					infoList.append( tqMakePair(CInfoDisplay::Morph, attr.nodeValue().string()) );
+					infoList.append( qMakePair(CInfoDisplay::Morph, attr.nodeValue().string()) );
 				}
 	
 				attr = currentNode.attributes().getNamedItem("expansion");
 				if (!attr.isNull()) {
-					infoList.append( tqMakePair(CInfoDisplay::Abbreviation, attr.nodeValue().string()) );
+					infoList.append( qMakePair(CInfoDisplay::Abbreviation, attr.nodeValue().string()) );
 				}
 				
 				attr = currentNode.attributes().getNamedItem("crossrefs");
 				if (!attr.isNull()) {
-					infoList.append( tqMakePair(CInfoDisplay::CrossReference, attr.nodeValue().string()) );
+					infoList.append( qMakePair(CInfoDisplay::CrossReference, attr.nodeValue().string()) );
 				}
 			}
 	

bibletime/main.cpp

@@ -116,7 +116,7 @@ extern "C" {
 }
 
 int main(int argc, char* argv[]) {
-	tqInstallMsgHandler( myMessageOutput );
+	qInstallMsgHandler( myMessageOutput );
 
 	//create about data for this application
 	static TDECmdLineOptions options[] =