Rename additional global TQt functions

pull/1/head
Timothy Pearson 12 years ago
parent 68e3faaecb
commit 426799905b

@ -146,7 +146,7 @@ Barcode_EAN13 barcodeRecognitionThread::recognize( TQImage img )
#ifdef BarcodeDecoder_DEBUG #ifdef BarcodeDecoder_DEBUG
// show the information that has been recognized along the scanline: // 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 #endif
} }

@ -274,7 +274,7 @@ int ng_vid_driver::xioctl( int fd, int cmd, void *arg )
if (rc == 0) if (rc == 0)
return 0; return 0;
//print_ioctl(stderr,ioctls_v4l1,PREFIX,cmd,arg); //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; return rc;
} }
@ -340,7 +340,7 @@ bool ng_vid_driver_v4l::open2( TQString device )
{ {
/* open device */ /* open device */
if ((m_fd = ::open( device.latin1(), O_RDWR )) == -1) { 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; return false;
} }
if (ioctl( m_fd, VIDIOCGCAP, &m_capability ) == -1) { if (ioctl( m_fd, VIDIOCGCAP, &m_capability ) == -1) {
@ -349,7 +349,7 @@ bool ng_vid_driver_v4l::open2( TQString device )
} }
#ifdef Barcode_DEBUG #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 #endif
fcntl( m_fd, F_SETFD, FD_CLOEXEC ); // close on exit 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; myDebug() << " capabilities: " << endl;
for (int i = 0; device_cap[i] != NULL; i++) for (int i = 0; device_cap[i] != NULL; i++)
if (m_capability.type & (1 << i)) if (m_capability.type & (1 << i))
qDebug( " %s", device_cap[i] ); tqDebug( " %s", device_cap[i] );
qDebug( " size : %dx%d => %dx%d", m_capability.minwidth, m_capability.minheight, m_capability.maxwidth, m_capability.maxheight ); tqDebug( " size : %dx%d => %dx%d", m_capability.minwidth, m_capability.minheight, m_capability.maxwidth, m_capability.maxheight );
#endif #endif
#ifdef Barcode_DEBUG #ifdef Barcode_DEBUG

@ -535,7 +535,7 @@ TQString HTMLExporter::fileDirName() const {
// how ugly is this? // how ugly is this?
const xmlChar* HTMLExporter::handleLink(const xmlChar* link_) { const xmlChar* HTMLExporter::handleLink(const xmlChar* link_) {
return reinterpret_cast<xmlChar*>(qstrdup(handleLink(TQString::fromUtf8(reinterpret_cast<const char*>(link_))).utf8())); return reinterpret_cast<xmlChar*>(tqstrdup(handleLink(TQString::fromUtf8(reinterpret_cast<const char*>(link_))).utf8()));
} }
TQString HTMLExporter::handleLink(const TQString& link_) { TQString HTMLExporter::handleLink(const TQString& link_) {
@ -585,7 +585,7 @@ TQString HTMLExporter::handleLink(const TQString& link_) {
} }
const xmlChar* HTMLExporter::analyzeInternalCSS(const xmlChar* str_) { const xmlChar* HTMLExporter::analyzeInternalCSS(const xmlChar* str_) {
return reinterpret_cast<xmlChar*>(qstrdup(analyzeInternalCSS(TQString::fromUtf8(reinterpret_cast<const char*>(str_))).utf8())); return reinterpret_cast<xmlChar*>(tqstrdup(analyzeInternalCSS(TQString::fromUtf8(reinterpret_cast<const char*>(str_))).utf8()));
} }
TQString HTMLExporter::analyzeInternalCSS(const TQString& str_) { TQString HTMLExporter::analyzeInternalCSS(const TQString& str_) {

@ -227,8 +227,8 @@ TQString XSLTHandler::process() {
TQMap<TQCString, TQCString>::ConstIterator it = m_params.constBegin(); TQMap<TQCString, TQCString>::ConstIterator it = m_params.constBegin();
TQMap<TQCString, TQCString>::ConstIterator end = m_params.constEnd(); TQMap<TQCString, TQCString>::ConstIterator end = m_params.constEnd();
for(uint i = 0; it != end; ++it) { for(uint i = 0; it != end; ++it) {
params[i ] = qstrdup(it.key()); params[i ] = tqstrdup(it.key());
params[i+1] = qstrdup(it.data()); params[i+1] = tqstrdup(it.data());
params[i+2] = NULL; params[i+2] = NULL;
i += 2; i += 2;
} }

Loading…
Cancel
Save