From 81dfa73cdd1bfd26bc85b560038e2787c941a945 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 24 Nov 2023 10:46:53 +0900 Subject: [PATCH] Replaced various '#define' with actual strings - part 3 Signed-off-by: Michele Calgaro --- bibletime/frontend/cinfodisplay.cpp | 2 +- bibletime/frontend/display/chtmlreaddisplay.cpp | 10 +++++----- bibletime/main.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bibletime/frontend/cinfodisplay.cpp b/bibletime/frontend/cinfodisplay.cpp index 4d76851..0f8cf40 100644 --- a/bibletime/frontend/cinfodisplay.cpp +++ b/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); } diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp index 1841eaa..a15c3a8 100644 --- a/bibletime/frontend/display/chtmlreaddisplay.cpp +++ b/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()) ); } } diff --git a/bibletime/main.cpp b/bibletime/main.cpp index 5f6672b..a8078f3 100644 --- a/bibletime/main.cpp +++ b/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[] =