From 93fbe96e7e6f692ec3f206f30ad9e4c7af4bb13e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 3 Dec 2023 00:47:39 +0900 Subject: Replaced various '#define' with actual strings - part 5 Signed-off-by: Michele Calgaro (cherry picked from commit dba614b5da2e38e284ba72c8a68556bac7e3fc1d) --- kmag/kmagzoomview.cpp | 4 ++-- kmouth/phrasebook/phrasebook.cpp | 2 +- kmouth/wordcompletion/wordlist.cpp | 2 +- ksayit/src/contextmenuhandler.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index ae9d06d..bb44444 100644 --- a/kmag/kmagzoomview.cpp +++ b/kmag/kmagzoomview.cpp @@ -246,7 +246,7 @@ void KMagZoomView::drawContents ( TQPainter * p, int clipx, int clipy, int clipw // show the pixel under mouse cursor if(m_showMouse) { // paint the mouse cursor - paintMouseCursor(TQT_TQPAINTDEVICE(&clippedPixmap), calcMousePos (m_refreshSwitch)-TQPoint (areaToPaint.x(), areaToPaint.y())); + paintMouseCursor(&clippedPixmap, calcMousePos (m_refreshSwitch)-TQPoint (areaToPaint.x(), areaToPaint.y())); } TQPixmap zoomedPixmap; @@ -889,7 +889,7 @@ TQPixmap KMagZoomView::getPixmap() TQPixmap mousePixmap(m_grabbedPixmap); // paint the mouse cursor w/o updating to a newer position - paintMouseCursor(TQT_TQPAINTDEVICE(&mousePixmap), calcMousePos(false)); + paintMouseCursor(&mousePixmap, calcMousePos(false)); return(mousePixmap); } else { // no mouse cursor diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index c095e6d..1fc4f9f 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/kmouth/phrasebook/phrasebook.cpp @@ -339,7 +339,7 @@ bool PhraseBook::open (const KURL &url) { // First: try to load it as a normal phrase book TQFile file(tempFile); - TQXmlInputSource source (TQT_TQIODEVICE(&file)); + TQXmlInputSource source (&file); bool error = !decode (source); // Second: if the file does not contain a phrase book, load it as diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp index adf73cb..2031c8e 100644 --- a/kmouth/wordcompletion/wordlist.cpp +++ b/kmouth/wordcompletion/wordlist.cpp @@ -160,7 +160,7 @@ void addWords (WordMap &map, WordMap add) { void addWordsFromFile (WordMap &map, TQString filename, TQTextStream::Encoding encoding, TQTextCodec *codec) { TQFile xmlfile(filename); - TQXmlInputSource source (TQT_TQIODEVICE(&xmlfile)); + TQXmlInputSource source (&xmlfile); XMLParser parser; TQXmlSimpleReader reader; reader.setFeature ("http://trolltech.com/xml/features/report-start-end-entity", true); diff --git a/ksayit/src/contextmenuhandler.cpp b/ksayit/src/contextmenuhandler.cpp index d6c5ddb..abee221 100644 --- a/ksayit/src/contextmenuhandler.cpp +++ b/ksayit/src/contextmenuhandler.cpp @@ -293,7 +293,7 @@ bool ContextMenuHandler::parseXmlFile(const TQString &xmlID) ContextActionHandler handler(this); handler.setSearchID(xmlID); parser.setContentHandler( &handler ); - return parser.parse( TQT_TQIODEVICE(&xmlFile) ); + return parser.parse( &xmlFile ); } -- cgit v1.2.1