From 518a47c1df15bbc2b4f60a73c0ae8c18d05e57b6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:18:46 -0600 Subject: Rename additional global TQt functions --- kbarcode/barcodeitem.cpp | 6 +++--- kbarcode/barkode.cpp | 4 ++-- kbarcode/batchprinter.cpp | 2 +- kbarcode/batchwizard.cpp | 2 +- kbarcode/commands.cpp | 4 ++-- kbarcode/csvimportdlg.cpp | 2 +- kbarcode/definition.cpp | 6 +++--- kbarcode/documentitem.cpp | 4 ++-- kbarcode/dsrichtext.cpp | 6 +++--- kbarcode/dstextedit.cpp | 2 +- kbarcode/gnubarcode.cpp | 8 ++++---- kbarcode/imageitem.cpp | 2 +- kbarcode/labelutils.cpp | 4 ++-- kbarcode/lineitem.cpp | 6 +++--- kbarcode/main.cpp | 2 +- kbarcode/mybarcode.cpp | 2 +- kbarcode/pixmapbarcode.cpp | 10 +++++----- kbarcode/purepostscript.cpp | 2 +- kbarcode/rectitem.cpp | 2 +- kbarcode/sqltables.cpp | 4 ++-- kbarcode/tbarcode2.cpp | 2 +- kbarcode/tec.cpp | 2 +- kbarcode/textitem.cpp | 6 +++--- kbarcode/textlineitem.cpp | 2 +- kbarcode/tokenprovider.cpp | 2 +- kbarcode/xmlutils.cpp | 2 +- 26 files changed, 48 insertions(+), 48 deletions(-) diff --git a/kbarcode/barcodeitem.cpp b/kbarcode/barcodeitem.cpp index 2b34aaa..3b8fdd2 100644 --- a/kbarcode/barcodeitem.cpp +++ b/kbarcode/barcodeitem.cpp @@ -193,7 +193,7 @@ void BarcodeItem::drawZpl( TQTextStream* stream ) TQString encoding = ZPLUtils::encoding( type() ); if( encoding.isNull() ) { - qDebug( "ERROR: No ZPL barcode found"); + tqDebug( "ERROR: No ZPL barcode found"); return; } @@ -208,7 +208,7 @@ void BarcodeItem::drawIpl( TQTextStream* stream, IPLUtils* utils ) if( encoding.isEmpty() ) { - qDebug( "ERROR: No IPL barcode found"); + tqDebug( "ERROR: No IPL barcode found"); return; } @@ -230,7 +230,7 @@ void BarcodeItem::drawEPcl( TQTextStream* stream ) TQString encoding = EPCLUtils::encoding( type() ); if( encoding.isEmpty() ) { - qDebug( "ERROR: No EPCL barcode found"); + tqDebug( "ERROR: No EPCL barcode found"); return; } diff --git a/kbarcode/barkode.cpp b/kbarcode/barkode.cpp index 9e460a1..b54592f 100644 --- a/kbarcode/barkode.cpp +++ b/kbarcode/barkode.cpp @@ -283,7 +283,7 @@ const TQString Barkode::parsedValue() v = 'Z'; temp[p] = TQChar(v); } else if( sequenceMode() == ALPHANUM ) { - qDebug("NOT IMPLEMENTED"); + tqDebug("NOT IMPLEMENTED"); /* char array[36]; for( unsigned int i = 'A'; i <= 'Z'; i++ ) array[i-'A'] = i; @@ -917,7 +917,7 @@ void Barkode::initValidators() if( !xml.open( IO_ReadOnly ) ) { - qDebug( "Cannot read validation rules from %s\n", path.latin1() ); + tqDebug( "Cannot read validation rules from %s\n", path.latin1() ); return; } diff --git a/kbarcode/batchprinter.cpp b/kbarcode/batchprinter.cpp index 2319fda..1922345 100644 --- a/kbarcode/batchprinter.cpp +++ b/kbarcode/batchprinter.cpp @@ -371,7 +371,7 @@ void BatchPrinter::startBCP() else /* TODO */; #warning "TEC requires Old KBarcode SQL tables for printing" - qDebug( "TEC requires Old KBarcode SQL tables for printing" ); + tqDebug( "TEC requires Old KBarcode SQL tables for printing" ); break; case PrinterSettings::ZEBRA: l->zpl( &stream ); diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp index 6e5bdc2..8415a17 100644 --- a/kbarcode/batchwizard.cpp +++ b/kbarcode/batchwizard.cpp @@ -884,7 +884,7 @@ void BatchWizard::loadFromFile( const TQString & url ) if( !file.open( IO_ReadOnly ) ) { - qDebug("Unable to open file: %s", url.latin1() ); + tqDebug("Unable to open file: %s", url.latin1() ); return; } diff --git a/kbarcode/commands.cpp b/kbarcode/commands.cpp index ae62911..ab980c1 100644 --- a/kbarcode/commands.cpp +++ b/kbarcode/commands.cpp @@ -91,7 +91,7 @@ void CommandUtils::documentItemDeleted() m_canvas_item = NULL; c = NULL; - qDebug("Document item removed from list!"); + tqDebug("Document item removed from list!"); delete this; */ } @@ -157,7 +157,7 @@ void NewItemCommand::documentItemDeleted() m_item = NULL; m_object = NULL; - qDebug("NewItemCommand: Document item removed from list!"); + tqDebug("NewItemCommand: Document item removed from list!"); delete this; */ } diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp index 7b42227..26e59da 100644 --- a/kbarcode/csvimportdlg.cpp +++ b/kbarcode/csvimportdlg.cpp @@ -375,7 +375,7 @@ void CSVImportDlg::accept() TQSqlQuery query; if( !query.exec( line ) ) - qDebug( i18n("Could not import the following line:") + line ); + tqDebug( i18n("Could not import the following line:") + line ); //KMessageBox::error( this, i18n("Could not import the following line:") + line ); } diff --git a/kbarcode/definition.cpp b/kbarcode/definition.cpp index 251e092..283bbef 100644 --- a/kbarcode/definition.cpp +++ b/kbarcode/definition.cpp @@ -517,7 +517,7 @@ int Definition::writeSQL( const Measurements & c, TQString type, TQString produc ); if(!query.isValid()) - qDebug("Query to insert values not valid!"); + tqDebug("Query to insert values not valid!"); } else { TQSqlQuery query( "UPDATE " TABLE_LABEL_DEF " SET " "gap_top = " + I2S( c.gapTopMM() ) + " ,gap_left = " + I2S( c.gapLeftMM() ) + @@ -528,7 +528,7 @@ int Definition::writeSQL( const Measurements & c, TQString type, TQString produc " type = '" + type + "'" ); if(!query.isValid()) - qDebug("Query to update values not valid!\n%s\n", query.lastQuery().latin1() ); + tqDebug("Query to update values not valid!\n%s\n", query.lastQuery().latin1() ); } TQSqlQuery qi("SELECT label_no FROM " TABLE_LABEL_DEF " WHERE manufacture='" + producer + "' AND type='" + type + "'" ); @@ -560,7 +560,7 @@ bool Definition::showFileError() nodefmsg = false; return openFile(); } else - qDebug("No label definitions found. Please install them."); + tqDebug("No label definitions found. Please install them."); return false; } diff --git a/kbarcode/documentitem.cpp b/kbarcode/documentitem.cpp index e2c1426..fbeea2a 100644 --- a/kbarcode/documentitem.cpp +++ b/kbarcode/documentitem.cpp @@ -142,7 +142,7 @@ TQRect DocumentItem::boundingRect() const r.setWidth( (int)(l.mmToPixel( m_rect.width(), m_device, LabelUtils::DpiX ) / 1000.0 ) ); r.setHeight( (int)(l.mmToPixel( m_rect.height(), m_device, LabelUtils::DpiY ) / 1000.0 ) ); -// qDebug("bounding rect %i %i %i %i", r.x(), r.y(), r.width(), r.height() ); +// tqDebug("bounding rect %i %i %i %i", r.x(), r.y(), r.width(), r.height() ); return r; } @@ -158,7 +158,7 @@ TQRect DocumentItem::rect() const { TQRect bound = boundingRect(); TQRect r( bound.x() + m_pen.width(), bound.y() + m_pen.width(), bound.width() - 2 * m_pen.width(), bound.height() - 2 * m_pen.width() ); -// qDebug("rect %i %i %i %i", r.x(), r.y(), r.width(), r.height() ); +// tqDebug("rect %i %i %i %i", r.x(), r.y(), r.width(), r.height() ); return r; } diff --git a/kbarcode/dsrichtext.cpp b/kbarcode/dsrichtext.cpp index b2444dc..2224f2f 100644 --- a/kbarcode/dsrichtext.cpp +++ b/kbarcode/dsrichtext.cpp @@ -51,7 +51,7 @@ DSRichText::DSRichText( const TQString & t ) text = "

" + t + "

"; - //qDebug( text ); + //tqDebug( text ); start = end = pos = 0; x = y = 0; @@ -211,8 +211,8 @@ bool DSRichText::parseParagraph() int alignment = 0; formated_word f; TQString d = parse( text, "", pos ); - //qDebug("D=" + d ); - //qDebug("POS=%i", pos ); + //tqDebug("D=" + d ); + //tqDebug("POS=%i", pos ); pos += d.length(); if( d.isNull() ) diff --git a/kbarcode/dstextedit.cpp b/kbarcode/dstextedit.cpp index 713a52c..87f93d7 100644 --- a/kbarcode/dstextedit.cpp +++ b/kbarcode/dstextedit.cpp @@ -126,7 +126,7 @@ bool DSTextEdit::cursorIsInToken() data = text( para ); - qDebug("data=" + data ); + tqDebug("data=" + data ); --index; firstopen = data.findRev( "[", index ); firstclose = data.findRev( "]", index ); diff --git a/kbarcode/gnubarcode.cpp b/kbarcode/gnubarcode.cpp index d009802..cd03e5d 100644 --- a/kbarcode/gnubarcode.cpp +++ b/kbarcode/gnubarcode.cpp @@ -59,7 +59,7 @@ void GnuBarcode::update( const TQPaintDevice* device ) if( m_item ) { - qDebug("Deleting"); + tqDebug("Deleting"); Barcode_Delete( m_item ); m_item = NULL; } @@ -173,7 +173,7 @@ int GnuBarcode::drawBars( TQPainter* painter, int x, int y ) int current = 0; unsigned int i = 0; - qDebug("Partial=%s\n", m_item->partial ); + tqDebug("Partial=%s\n", m_item->partial ); for( i = 0; i < strlen(m_item->partial); i++) { current = (int)m_item->partial[i] - ASCII_ZERO; @@ -191,7 +191,7 @@ int GnuBarcode::drawBars( TQPainter* painter, int x, int y ) if( current < 0 ) { - qDebug("current < 0: %i", current ); + tqDebug("current < 0: %i", current ); current = 0; break; } @@ -259,7 +259,7 @@ int GnuBarcode::drawBars( TQPainter* painter, int x, int y ) { painter->fillRect( x + x0, y0, j, yr, barkode->foreground() ); } - //qDebug("Bar = %i", j ); + //tqDebug("Bar = %i", j ); } xpos += j; } diff --git a/kbarcode/imageitem.cpp b/kbarcode/imageitem.cpp index a091c37..b7711af 100644 --- a/kbarcode/imageitem.cpp +++ b/kbarcode/imageitem.cpp @@ -83,7 +83,7 @@ void ImageItem::drawZpl( TQTextStream* stream ) void ImageItem::drawIpl( TQTextStream*, IPLUtils* ) { - qDebug("ImageItem is not implemented for IPL!"); + tqDebug("ImageItem is not implemented for IPL!"); } void ImageItem::drawEPcl( TQTextStream* stream ) diff --git a/kbarcode/labelutils.cpp b/kbarcode/labelutils.cpp index 74ca158..44da93f 100644 --- a/kbarcode/labelutils.cpp +++ b/kbarcode/labelutils.cpp @@ -61,8 +61,8 @@ double LabelUtils::mmToPixel( double mm, const TQPaintDevice* device, int mode ) TQPaintDeviceMetrics pdm( device ? device : TQT_TQPAINTDEVICE(KApplication::desktop()) ); -// qDebug("DpiX=%i", pdm.logicalDpiX()); -// qDebug("DpiY=%i", pdm.logicalDpiY()); +// tqDebug("DpiX=%i", pdm.logicalDpiX()); +// tqDebug("DpiY=%i", pdm.logicalDpiY()); if( mode == DpiX ) return (mm / CONVERSION_FACTOR) * (double)pdm.logicalDpiX(); else diff --git a/kbarcode/lineitem.cpp b/kbarcode/lineitem.cpp index 4ebf622..b63d18b 100644 --- a/kbarcode/lineitem.cpp +++ b/kbarcode/lineitem.cpp @@ -43,17 +43,17 @@ void LineItem::draw(TQPainter* painter) void LineItem::drawZpl( TQTextStream* ) { - qDebug("LineItem not implemented for ZPL"); + tqDebug("LineItem not implemented for ZPL"); } void LineItem::drawEPcl( TQTextStream* ) { - qDebug("LineItem not implemented for EPCL"); + tqDebug("LineItem not implemented for EPCL"); } void LineItem::drawIpl( TQTextStream*, IPLUtils* ) { - qDebug("LineItem not implemented for IPL"); + tqDebug("LineItem not implemented for IPL"); } void LineItem::loadXML(TQDomElement* element) diff --git a/kbarcode/main.cpp b/kbarcode/main.cpp index ea0ff74..30378ef 100644 --- a/kbarcode/main.cpp +++ b/kbarcode/main.cpp @@ -66,7 +66,7 @@ void setupDirs() if( !tdedir.contains( "/usr/" ) ) dirs->addPrefix( "/usr/" ); - qDebug("WARNING: Prefix changed: %s", dirs->kfsstnd_prefixes().latin1() ); + tqDebug("WARNING: Prefix changed: %s", dirs->kfsstnd_prefixes().latin1() ); } } diff --git a/kbarcode/mybarcode.cpp b/kbarcode/mybarcode.cpp index 5a10207..375e05e 100644 --- a/kbarcode/mybarcode.cpp +++ b/kbarcode/mybarcode.cpp @@ -452,7 +452,7 @@ TQString BarCode::createSequence( const TQString & value ) v = 'Z'; temp[p] = TQChar(v); } else if( barcode.sequence.mode == ALPHANUM ) { - qDebug("NOT IMPLEMENTED"); + tqDebug("NOT IMPLEMENTED"); /* char array[36]; for( unsigned int i = 'A'; i <= 'Z'; i++ ) array[i-'A'] = i; diff --git a/kbarcode/pixmapbarcode.cpp b/kbarcode/pixmapbarcode.cpp index 6e84193..02cb19b 100644 --- a/kbarcode/pixmapbarcode.cpp +++ b/kbarcode/pixmapbarcode.cpp @@ -178,11 +178,11 @@ bool PixmapBarcode::createPixmap( TQPixmap* target, int resx, int resy ) cmd += input->name(); cmd += " -sNOPAUSE -q - -c showpage quit"; - qDebug("cmd: " + cmd ); + tqDebug("cmd: " + cmd ); gs_pipe = popen( cmd.latin1(), "w" ); if( !gs_pipe ) { - qDebug("ERROR: cannot open Ghostscript pipe!"); + tqDebug("ERROR: cannot open Ghostscript pipe!"); cleanUp( input, target ); return false; } @@ -210,7 +210,7 @@ bool PixmapBarcode::createPostscript( char** postscript, long* postscript_size ) if( Barkode::engineForType( barkode->type() ) == TBARCODE ) { cmd = createTBarcodeCmd(); - qDebug("tbarcodeclient commandline: %s", cmd.latin1() ); + tqDebug("tbarcodeclient commandline: %s", cmd.latin1() ); } else // GNU_BARCODE */ @@ -267,7 +267,7 @@ bool PixmapBarcode::readFromPipe( const char* command, char** buffer, long* buff FILE* pipe = popen( command, "r" ); if( !pipe ) { - qDebug("ERROR: cannot open pipe %s!", command ); + tqDebug("ERROR: cannot open pipe %s!", command ); return false; } @@ -352,7 +352,7 @@ bool PixmapBarcode::createPdf417( KTempFile* output ) if( !options ) { - qDebug("No PDF417Options available!"); + tqDebug("No PDF417Options available!"); return false; } diff --git a/kbarcode/purepostscript.cpp b/kbarcode/purepostscript.cpp index 43c7f84..5613aac 100644 --- a/kbarcode/purepostscript.cpp +++ b/kbarcode/purepostscript.cpp @@ -71,7 +71,7 @@ PurePostscriptBarcode::PurePostscriptBarcode() if( s_path.isNull() ) { - qDebug( "Cannot locate barcode writer in pure postscript." ); + tqDebug( "Cannot locate barcode writer in pure postscript." ); return; } diff --git a/kbarcode/rectitem.cpp b/kbarcode/rectitem.cpp index 9e52e97..560dc99 100644 --- a/kbarcode/rectitem.cpp +++ b/kbarcode/rectitem.cpp @@ -92,7 +92,7 @@ void RectItem::drawIpl( TQTextStream* stream, IPLUtils* utils ) int thick = pen().width(); if( m_circle ) - qDebug("Cirlce not implemented for IPL"); + tqDebug("Cirlce not implemented for IPL"); else { int counter = utils->counter(); diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp index 9300807..1a72504 100644 --- a/kbarcode/sqltables.cpp +++ b/kbarcode/sqltables.cpp @@ -306,7 +306,7 @@ void SqlTables::importExampleData() void SqlTables::importData( const TQString & filename, TQSqlDatabase* db ) { if( !db ) { - qDebug("Can't import data, dabase not open!"); + tqDebug("Can't import data, dabase not open!"); return; } @@ -396,7 +396,7 @@ void SqlTables::updateTables() for( unsigned int i = 0; i < 10; i++ ) q.exec("ALTER TABLE " TABLE_BASIC " ADD " + fields[i] + " varchar(50)"); - qDebug("changing fields"); + tqDebug("changing fields"); changed = true; } diff --git a/kbarcode/tbarcode2.cpp b/kbarcode/tbarcode2.cpp index eb98756..8490f7c 100644 --- a/kbarcode/tbarcode2.cpp +++ b/kbarcode/tbarcode2.cpp @@ -122,7 +122,7 @@ bool TBarcode2::createPostscript( char** postscript, long* postscript_size ) tbarcode->height(), tbarcode->checksum() ); - qDebug( "Cmd = " + cmd ); + tqDebug( "Cmd = " + cmd ); if( !readFromPipe( cmd.latin1(), postscript, postscript_size ) ) return false; diff --git a/kbarcode/tec.cpp b/kbarcode/tec.cpp index 7d20b79..1d183b8 100644 --- a/kbarcode/tec.cpp +++ b/kbarcode/tec.cpp @@ -435,7 +435,7 @@ while (res ==-1 ){ res=read(fd,buf,MAXDATASIZE); } temp = TQString(buf); -//qDebug ("serial: "+temp+"\n"); +//tqDebug ("serial: "+temp+"\n"); // LF = = 10 // CR = \r = 13 diff --git a/kbarcode/textitem.cpp b/kbarcode/textitem.cpp index 0b00e7a..eba6610 100644 --- a/kbarcode/textitem.cpp +++ b/kbarcode/textitem.cpp @@ -217,8 +217,8 @@ bool TextItem::IsTQtTextRenderingBroken() { if( !s_qt_broken_init ) { - TQString version( qVersion() ); -// qDebug( "Detected TQt Version: %s", version.latin1() ); + TQString version( tqVersion() ); +// tqDebug( "Detected TQt Version: %s", version.latin1() ); int major = version.section( ".", 0, 0 ).toInt(); int minor = version.section( ".", 1, 1 ).toInt(); int bugfix = version.section( ".", 2, 2 ).toInt(); @@ -241,7 +241,7 @@ bool TextItem::IsTQtTextRenderingBroken() s_qt_broken = true; if( s_qt_broken ) - qDebug("TQt's text redering is broken - using KBarcode fix."); + tqDebug("TQt's text redering is broken - using KBarcode fix."); s_qt_broken_init = true; return s_qt_broken; diff --git a/kbarcode/textlineitem.cpp b/kbarcode/textlineitem.cpp index 2beaabf..b5f5616 100644 --- a/kbarcode/textlineitem.cpp +++ b/kbarcode/textlineitem.cpp @@ -215,7 +215,7 @@ bool TextLineItem::IsTQtTextRenderingBroken() { if( !s_qt_broken_init ) { - TQString version( qVersion() ); + TQString version( tqVersion() ); int major = version.section( ".", 0, 0 ).toInt(); int minor = version.section( ".", 1, 1 ).toInt(); int bugfix = version.section( ".", 2, 2 ).toInt(); diff --git a/kbarcode/tokenprovider.cpp b/kbarcode/tokenprovider.cpp index 63ba755..1ad31d0 100644 --- a/kbarcode/tokenprovider.cpp +++ b/kbarcode/tokenprovider.cpp @@ -834,7 +834,7 @@ TQString TokenProvider::jsParse( const TQString & script ) #ifdef USE_JAVASCRIPT #if 0 KJS::Interpreter *js = KParts::ComponentFactory::createInstanceFromQuery( "KJSEmbed/KJSEmbed" ); - qDebug("JavaScript: %p", js ); + tqDebug("JavaScript: %p", js ); // KJS::Interpreter *js = KJSEmbed::JSFactory::defaultJS() // KJS::Interpreter *js = new KJS::Interpreter(); //KJSEmbed::JSFactory::defaultJS(); KJS::Completion comp; diff --git a/kbarcode/xmlutils.cpp b/kbarcode/xmlutils.cpp index e87e999..2c18307 100644 --- a/kbarcode/xmlutils.cpp +++ b/kbarcode/xmlutils.cpp @@ -386,7 +386,7 @@ Definition* XMLUtils::readDefinition( TQDomElement* tag ) m.setNumV( tag->attribute("num_v", I2S( m.numH() )).toInt() ); m.setNumH( tag->attribute("num_h", I2S( m.numV() )).toInt() ); - qDebug("Definition not found: writing to file!"); + tqDebug("Definition not found: writing to file!"); d->setId( Definition::write( m, type, producer ) ); return d; -- cgit v1.2.1