From 426799905b91f0005c33c4792c444b2b87e774d9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:23:03 -0600 Subject: [PATCH] Rename additional global TQt functions --- src/barcode/barcode.cpp | 2 +- src/barcode/barcode_v4l.cpp | 10 +++++----- src/translators/htmlexporter.cpp | 4 ++-- src/translators/xslthandler.cpp | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/barcode/barcode.cpp b/src/barcode/barcode.cpp index 1c2d1f2..05302b3 100644 --- a/src/barcode/barcode.cpp +++ b/src/barcode/barcode.cpp @@ -146,7 +146,7 @@ Barcode_EAN13 barcodeRecognitionThread::recognize( TQImage img ) #ifdef BarcodeDecoder_DEBUG // show the information that has been recognized along the scanline: - qDebug( "Scanline %i result: %s\n", i, ean13_code.toString().latin1() ); + tqDebug( "Scanline %i result: %s\n", i, ean13_code.toString().latin1() ); #endif } diff --git a/src/barcode/barcode_v4l.cpp b/src/barcode/barcode_v4l.cpp index 73cbbd2..10f501a 100644 --- a/src/barcode/barcode_v4l.cpp +++ b/src/barcode/barcode_v4l.cpp @@ -274,7 +274,7 @@ int ng_vid_driver::xioctl( int fd, int cmd, void *arg ) if (rc == 0) return 0; //print_ioctl(stderr,ioctls_v4l1,PREFIX,cmd,arg); - qDebug( ": %s\n",(rc == 0) ? "ok" : strerror(errno) ); + tqDebug( ": %s\n",(rc == 0) ? "ok" : strerror(errno) ); return rc; } @@ -340,7 +340,7 @@ bool ng_vid_driver_v4l::open2( TQString device ) { /* open device */ if ((m_fd = ::open( device.latin1(), O_RDWR )) == -1) { - qDebug( "v4l: open %s: %s\n", device.latin1(), strerror(errno) ); + tqDebug( "v4l: open %s: %s\n", device.latin1(), strerror(errno) ); return false; } if (ioctl( m_fd, VIDIOCGCAP, &m_capability ) == -1) { @@ -349,7 +349,7 @@ bool ng_vid_driver_v4l::open2( TQString device ) } #ifdef Barcode_DEBUG - qDebug( "v4l: open: %s (%s)\n", device.latin1(), m_capability.name ); + tqDebug( "v4l: open: %s (%s)\n", device.latin1(), m_capability.name ); #endif fcntl( m_fd, F_SETFD, FD_CLOEXEC ); // close on exit @@ -358,8 +358,8 @@ bool ng_vid_driver_v4l::open2( TQString device ) myDebug() << " capabilities: " << endl; for (int i = 0; device_cap[i] != NULL; i++) if (m_capability.type & (1 << i)) - qDebug( " %s", device_cap[i] ); - qDebug( " size : %dx%d => %dx%d", m_capability.minwidth, m_capability.minheight, m_capability.maxwidth, m_capability.maxheight ); + tqDebug( " %s", device_cap[i] ); + tqDebug( " size : %dx%d => %dx%d", m_capability.minwidth, m_capability.minheight, m_capability.maxwidth, m_capability.maxheight ); #endif #ifdef Barcode_DEBUG diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp index ce84d19..2db0fc4 100644 --- a/src/translators/htmlexporter.cpp +++ b/src/translators/htmlexporter.cpp @@ -535,7 +535,7 @@ TQString HTMLExporter::fileDirName() const { // how ugly is this? const xmlChar* HTMLExporter::handleLink(const xmlChar* link_) { - return reinterpret_cast(qstrdup(handleLink(TQString::fromUtf8(reinterpret_cast(link_))).utf8())); + return reinterpret_cast(tqstrdup(handleLink(TQString::fromUtf8(reinterpret_cast(link_))).utf8())); } TQString HTMLExporter::handleLink(const TQString& link_) { @@ -585,7 +585,7 @@ TQString HTMLExporter::handleLink(const TQString& link_) { } const xmlChar* HTMLExporter::analyzeInternalCSS(const xmlChar* str_) { - return reinterpret_cast(qstrdup(analyzeInternalCSS(TQString::fromUtf8(reinterpret_cast(str_))).utf8())); + return reinterpret_cast(tqstrdup(analyzeInternalCSS(TQString::fromUtf8(reinterpret_cast(str_))).utf8())); } TQString HTMLExporter::analyzeInternalCSS(const TQString& str_) { diff --git a/src/translators/xslthandler.cpp b/src/translators/xslthandler.cpp index 98f6527..0c300bb 100644 --- a/src/translators/xslthandler.cpp +++ b/src/translators/xslthandler.cpp @@ -227,8 +227,8 @@ TQString XSLTHandler::process() { TQMap::ConstIterator it = m_params.constBegin(); TQMap::ConstIterator end = m_params.constEnd(); for(uint i = 0; it != end; ++it) { - params[i ] = qstrdup(it.key()); - params[i+1] = qstrdup(it.data()); + params[i ] = tqstrdup(it.key()); + params[i+1] = tqstrdup(it.data()); params[i+2] = NULL; i += 2; }