diff options
author | Timothy Pearson <[email protected]> | 2012-03-01 13:32:17 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-03-01 13:32:17 -0600 |
commit | c509088a31cffd8e6d25c00a00414025426fc737 (patch) | |
tree | 06242637d2244aa79ad8812f39e64005ffc5ea91 | |
parent | 913e257dbbebe29c4f356ebb9fc6e888d0d1ac75 (diff) | |
download | tdegraphics-c509088a31cffd8e6d25c00a00414025426fc737.tar.gz tdegraphics-c509088a31cffd8e6d25c00a00414025426fc737.zip |
Rename additional global TQt functions
-rw-r--r-- | kdvi/TeXFont_PK.cpp | 2 | ||||
-rw-r--r-- | kdvi/dviFile.cpp | 2 | ||||
-rw-r--r-- | kghostview/kgvdocument.cpp | 4 | ||||
-rw-r--r-- | kmrml/kmrml/kcontrol/indexer.cpp | 10 | ||||
-rw-r--r-- | kmrml/kmrml/kcontrol/indextest.cpp | 4 | ||||
-rw-r--r-- | kmrml/kmrml/lib/kmrml_config.cpp | 4 | ||||
-rw-r--r-- | kmrml/kmrml/lib/mrml_utils.cpp | 2 | ||||
-rw-r--r-- | kmrml/kmrml/loader.cpp | 2 | ||||
-rw-r--r-- | kmrml/kmrml/mrml.cpp | 8 | ||||
-rw-r--r-- | kmrml/kmrml/mrml_elements.cpp | 2 | ||||
-rw-r--r-- | kmrml/kmrml/mrml_part.cpp | 14 | ||||
-rw-r--r-- | kmrml/kmrml/mrml_view.cpp | 4 | ||||
-rw-r--r-- | kmrml/kmrml/mrmlsearch.cpp | 2 | ||||
-rw-r--r-- | kmrml/kmrml/propertysheet.cpp | 2 | ||||
-rw-r--r-- | kuickshow/src/aboutwidget.cpp | 2 | ||||
-rw-r--r-- | kuickshow/src/imagewindow.cpp | 2 | ||||
-rw-r--r-- | kuickshow/src/imlibwidget.cpp | 10 | ||||
-rw-r--r-- | kuickshow/src/kuickimage.cpp | 14 | ||||
-rw-r--r-- | kuickshow/src/kuickshow.cpp | 8 | ||||
-rw-r--r-- | libkscan/kscandevice.cpp | 16 | ||||
-rw-r--r-- | libkscan/kscanoption.cpp | 12 |
21 files changed, 63 insertions, 63 deletions
diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp index e2597971..625e86d0 100644 --- a/kdvi/TeXFont_PK.cpp +++ b/kdvi/TeXFont_PK.cpp @@ -554,7 +554,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch) int wordSize; bool bigEndian; - qSysInfo (&wordSize, &bigEndian); + tqSysInfo (&wordSize, &bigEndian); if (bigEndian) { // Routine for big Endian machines. Applies e.g. to Motorola and diff --git a/kdvi/dviFile.cpp b/kdvi/dviFile.cpp index b3937265..7fb2bef7 100644 --- a/kdvi/dviFile.cpp +++ b/kdvi/dviFile.cpp @@ -338,7 +338,7 @@ void dvifile::renumber() // orderings. int wordSize; bool bigEndian; - qSysInfo (&wordSize, &bigEndian); + tqSysInfo (&wordSize, &bigEndian); for(TQ_UINT32 i=1; i<=total_pages; i++) { TQ_UINT8 *ptr = dviData.data() + page_offset[i-1]+1; diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp index 551f43c6..407566b8 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -433,7 +433,7 @@ const CDSCMEDIA* KGVDocument::findMediaByName( const TQString& mediaName ) const if( dsc()->media() ) { for( unsigned int i = 0; i < dsc()->media_count(); i++ ) { if( dsc()->media()[i] && dsc()->media()[i]->name - && qstricmp( mediaName.local8Bit(), + && tqstricmp( mediaName.local8Bit(), dsc()->media()[i]->name ) == 0 ) { return dsc()->media()[i]; } @@ -443,7 +443,7 @@ const CDSCMEDIA* KGVDocument::findMediaByName( const TQString& mediaName ) const /* Try our known media */ const CDSCMEDIA *m = dsc_known_media; while( m->name ) { - if( qstricmp( mediaName.local8Bit(), m->name ) == 0 ) { + if( tqstricmp( mediaName.local8Bit(), m->name ) == 0 ) { return m; } m++; diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp index 3f479ee6..307cff95 100644 --- a/kmrml/kmrml/kcontrol/indexer.cpp +++ b/kmrml/kmrml/kcontrol/indexer.cpp @@ -102,7 +102,7 @@ void Indexer::processNext() if ( index != -1 ) cmd.replace( index, 2, TQUOTE(m_currentDir + "_thumbnails") ); -// qDebug("****** command: %s", cmd.latin1()); +// tqDebug("****** command: %s", cmd.latin1()); #if TDE_VERSION >= 306 *m_process << cmd; #else @@ -139,9 +139,9 @@ void Indexer::slotCanRead( KProcIO *proc ) // cut off "PROGRESS: " line = line.mid( sprogress.length() ); line = line.simplifyWhiteSpace().stripWhiteSpace(); -// qDebug("*** START LINE ***"); -// qDebug("%s", line.latin1()); -// qDebug("*** END LINE ***"); +// tqDebug("*** START LINE ***"); +// tqDebug("%s", line.latin1()); +// tqDebug("*** END LINE ***"); // case 1: image processing, below 99% if ( line.at( line.length() -1 ) == ')' ) @@ -154,7 +154,7 @@ void Indexer::slotCanRead( KProcIO *proc ) TQString numFiles = regxp.cap( 2 ); TQString percent = regxp.cap( 3 ); -// qDebug( "current: %s, number: %s, percent: %s", currentFile.latin1(), numFiles.latin1(), percent.latin1()); +// tqDebug( "current: %s, number: %s, percent: %s", currentFile.latin1(), numFiles.latin1(), percent.latin1()); bool ok = false; int perc = percent.toInt( &ok ); if ( ok ) diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp index fdaffcde..f6eaa34b 100644 --- a/kmrml/kmrml/kcontrol/indextest.cpp +++ b/kmrml/kmrml/kcontrol/indextest.cpp @@ -26,12 +26,12 @@ IndexTest::~IndexTest() void IndexTest::slotFinished( bool success ) { - qDebug("##### FINISHED: %i", success ); + tqDebug("##### FINISHED: %i", success ); } void IndexTest::slotProgress( int percent, const TQString& message ) { - qDebug("--- progress: %i: %s", percent, message.latin1()); + tqDebug("--- progress: %i: %s", percent, message.latin1()); } int main( int argc, char **argv ) diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp index 43298376..f8ac6502 100644 --- a/kmrml/kmrml/lib/kmrml_config.cpp +++ b/kmrml/kmrml/lib/kmrml_config.cpp @@ -244,7 +244,7 @@ TQString Config::mrmldCommandline() const cmd.replace( index, 2, TQUOTE( mrmldDataDir() ) ); } - qDebug("***** commandline: %s", cmd.latin1()); + tqDebug("***** commandline: %s", cmd.latin1()); return cmd; } @@ -322,7 +322,7 @@ unsigned short int ServerSettings::port() const { TQString line; (void) file.readLine( line, 6 ); -// qDebug("**** read: %s", line.latin1()); +// tqDebug("**** read: %s", line.latin1()); file.close(); diff --git a/kmrml/kmrml/lib/mrml_utils.cpp b/kmrml/kmrml/lib/mrml_utils.cpp index f20dad6a..d493e58d 100644 --- a/kmrml/kmrml/lib/mrml_utils.cpp +++ b/kmrml/kmrml/lib/mrml_utils.cpp @@ -43,7 +43,7 @@ Util::Util() { DCOPClient::setMainClient( new DCOPClient() ); if ( !DCOPClient::mainClient()->attach() ) - qWarning( "kio_mrml: Can't attach to DCOP Server."); + tqWarning( "kio_mrml: Can't attach to DCOP Server."); } } diff --git a/kmrml/kmrml/loader.cpp b/kmrml/kmrml/loader.cpp index ea8803e2..7b806580 100644 --- a/kmrml/kmrml/loader.cpp +++ b/kmrml/kmrml/loader.cpp @@ -78,7 +78,7 @@ void Loader::slotData( KIO::Job *job, const TQByteArray& data ) if ( !buffer.isOpen() ) buffer.open( IO_ReadWrite ); if ( !buffer.isOpen() ) { - qDebug("********* EEK, can't open buffer for thumbnail download!"); + tqDebug("********* EEK, can't open buffer for thumbnail download!"); return; } diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp index a61de8f1..3a6f6721 100644 --- a/kmrml/kmrml/mrml.cpp +++ b/kmrml/kmrml/mrml.cpp @@ -88,7 +88,7 @@ bool Mrml::checkLocalServer( const KURL& url ) void Mrml::get( const KURL& url ) { -// qDebug("******* getting: %s (user: %s)", url.url().latin1(), url.user().latin1()); +// tqDebug("******* getting: %s (user: %s)", url.url().latin1(), url.user().latin1()); if ( !checkLocalServer( url ) ) { @@ -105,7 +105,7 @@ tryConnect: if ( connectToHost( url.host(), port(url), sendError ) ) { -// qDebug(" connected!"); +// tqDebug(" connected!"); TQString task = metaData( MrmlShared::kio_task() ); @@ -171,7 +171,7 @@ TQCString Mrml::readAll() data.append( buf ); } -// qDebug("*** readAll()::: %i, %s", data.length(), data.data()); +// tqDebug("*** readAll()::: %i, %s", data.length(), data.data()); return data; } @@ -223,7 +223,7 @@ bool Mrml::startSession( const KURL& url ) </mrml>" ).arg( user( url )); TQCString utf8 = msg.utf8(); -// qDebug(":::Writing: %s", utf8.data()); +// tqDebug(":::Writing: %s", utf8.data()); write( utf8, utf8.length() ); emitData( readAll() ); diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp index 3fadcaba..73bb5316 100644 --- a/kmrml/kmrml/mrml_elements.cpp +++ b/kmrml/kmrml/mrml_elements.cpp @@ -131,7 +131,7 @@ Algorithm::Algorithm( const TQDomElement& elem ) TQDomElement propsElem = firstChildElement(elem, MrmlShared::propertySheet()); m_propertySheet.initFromDOM( propsElem ); - qDebug("############# new algorithm: name: %s, id: %s, type: %s", m_name.latin1(), m_id.latin1(), m_type.latin1()); + tqDebug("############# new algorithm: name: %s, id: %s, type: %s", m_name.latin1(), m_id.latin1(), m_type.latin1()); } Algorithm Algorithm::defaultAlgorithm() diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp index 7a8967c8..d54f8525 100644 --- a/kmrml/kmrml/mrml_part.cpp +++ b/kmrml/kmrml/mrml_part.cpp @@ -223,7 +223,7 @@ bool MrmlPart::openURL( const KURL& url ) closeURL(); if ( url.protocol() != "mrml" || !url.isValid() ) { - qWarning("MrmlPart::openURL: cannot handle url: %s", url.prettyURL().latin1()); + tqWarning("MrmlPart::openURL: cannot handle url: %s", url.prettyURL().latin1()); return false; // what to do with that? } @@ -416,7 +416,7 @@ void MrmlPart::slotResult( KIO::Job *job ) emit completed(); else { emit canceled( job->errorString() ); -// qDebug("*** canceled: error: %s", job->errorString().latin1()); +// tqDebug("*** canceled: error: %s", job->errorString().latin1()); } @@ -475,7 +475,7 @@ void MrmlPart::parseMrml( TQDomDocument& doc ) if ( !mrml.isNull() ) { TQDomNode child = mrml.firstChild(); for ( ; !child.isNull(); child = child.nextSibling() ) { -// qDebug("**** HERE %s", child.nodeName().latin1()); +// tqDebug("**** HERE %s", child.nodeName().latin1()); if ( child.isElement() ) { TQDomElement elem = child.toElement(); @@ -582,9 +582,9 @@ void MrmlPart::createQuery( const KURL::List * relevantItems ) transactionId() ); Collection coll = currentCollection(); -// qDebug("** collection: name: %s, id: %s, valid: %i", coll.name().latin1(), coll.id().latin1(), coll.isValid()); +// tqDebug("** collection: name: %s, id: %s, valid: %i", coll.name().latin1(), coll.id().latin1(), coll.isValid()); Algorithm algo = firstAlgorithmForCollection( coll ); -// qDebug("** algorithm: name: %s, id: %s, valid: %i, collection-id: %s", algo.name().latin1(), algo.id().latin1(), algo.isValid(), algo.collectionId().latin1()); +// tqDebug("** algorithm: name: %s, id: %s, valid: %i, collection-id: %s", algo.name().latin1(), algo.id().latin1(), algo.isValid(), algo.collectionId().latin1()); if ( algo.isValid() ) { @@ -639,7 +639,7 @@ Algorithm MrmlPart::firstAlgorithmForCollection( const Collection& coll ) const } } - qDebug("#################### -> ADEFAULT!"); + tqDebug("#################### -> ADEFAULT!"); Algorithm algo = Algorithm::defaultAlgorithm(); algo.setCollectionId( coll.id() ); return algo; @@ -691,7 +691,7 @@ void MrmlPart::performQuery( TQDomDocument& doc ) slotSetStatusBar( randomSearch ? i18n("Random search...") : i18n("Searching...") ); m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_startQuery() ); - qDebug("\n\nSending XML:\n%s", doc.toString().latin1()); + tqDebug("\n\nSending XML:\n%s", doc.toString().latin1()); m_job->addMetaData( MrmlShared::mrml_data(), doc.toString() ); } diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp index 2fed1bcb..9555d9a1 100644 --- a/kmrml/kmrml/mrml_view.cpp +++ b/kmrml/kmrml/mrml_view.cpp @@ -84,12 +84,12 @@ MrmlViewItem * MrmlView::addItem( const KURL& url, const KURL& thumbURL, double similarity ) { if ( !url.isValid() ) { - qWarning( "MrmlPart: received malformed URL from query: %s", + tqWarning( "MrmlPart: received malformed URL from query: %s", url.prettyURL().isNull() ? "(null)" : url.prettyURL().latin1() ); return 0L; } -// qDebug("** url: %s", thumbURL.url().latin1()); +// tqDebug("** url: %s", thumbURL.url().latin1()); MrmlViewItem *item = new MrmlViewItem( url, thumbURL, similarity, this ); TQPixmap *pixmap = getPixmap( thumbURL ); diff --git a/kmrml/kmrml/mrmlsearch.cpp b/kmrml/kmrml/mrmlsearch.cpp index a2774fb9..8ad00f24 100644 --- a/kmrml/kmrml/mrmlsearch.cpp +++ b/kmrml/kmrml/mrmlsearch.cpp @@ -66,7 +66,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) query = KURL::encode_string_no_slash( query ); query.prepend( "?relevant=" ); // this is not encoded! url.setQuery( query ); - qDebug("***** Query: %s ** URL: %s", query.latin1(), url.url().latin1()); + tqDebug("***** Query: %s ** URL: %s", query.latin1(), url.url().latin1()); return execlp( "kfmclient", "kfmclient", "openURL", TQFile::encodeName(url.url()).data(), diff --git a/kmrml/kmrml/propertysheet.cpp b/kmrml/kmrml/propertysheet.cpp index af913558..a4278f56 100644 --- a/kmrml/kmrml/propertysheet.cpp +++ b/kmrml/kmrml/propertysheet.cpp @@ -128,7 +128,7 @@ TQWidget * PropertySheet::createWidget( TQWidget */*parent*/, const char */*name } default: - qDebug("** can't create widget for type: %i", m_type); + tqDebug("** can't create widget for type: %i", m_type); } return w; diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp index dc43578f..72ce1839 100644 --- a/kuickshow/src/aboutwidget.cpp +++ b/kuickshow/src/aboutwidget.cpp @@ -72,7 +72,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name ) else { delete im; im = 0L; - qWarning( "KuickShow: about-image not found/unreadable." ); + tqWarning( "KuickShow: about-image not found/unreadable." ); } } diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 12aa9118..39af7f51 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -288,7 +288,7 @@ void ImageWindow::setFullscreen( bool enable ) void ImageWindow::updateGeometry( int imWidth, int imHeight ) { -// qDebug("::updateGeometry: %i, %i", imWidth, imHeight); +// tqDebug("::updateGeometry: %i, %i", imWidth, imHeight); // XMoveWindow( x11Display(), win, 0, 0 ); XResizeWindow( x11Display(), win, imWidth, imHeight ); diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp index 0bca3271..36420918 100644 --- a/kuickshow/src/imlibwidget.cpp +++ b/kuickshow/src/imlibwidget.cpp @@ -109,7 +109,7 @@ void ImlibWidget::init() m_kuickFile = 0L; if ( !id ) - qFatal("ImlibWidget: Imlib not initialized, aborting."); + tqFatal("ImlibWidget: Imlib not initialized, aborting."); setAutoRender( true ); @@ -198,7 +198,7 @@ bool ImlibWidget::loadImage( KuickFile * file ) bool ImlibWidget::cacheImage( const KURL& url ) { -// qDebug("cache image: %s", url.url().latin1()); +// tqDebug("cache image: %s", url.url().latin1()); KuickFile *file = FileCache::self()->getFile( url ); if ( file->isAvailable() ) return cacheImage( file ); @@ -213,7 +213,7 @@ bool ImlibWidget::cacheImage( const KURL& url ) bool ImlibWidget::cacheImage( KuickFile * file ) { -// qDebug("cache image: %s", file->url().url().latin1()); +// tqDebug("cache image: %s", file->url().url().latin1()); KuickImage *kuim = loadImageInternal( file ); if ( kuim ) { kuim->renderPixmap(); @@ -632,7 +632,7 @@ KuickImage * ImageCache::getKuimage( KuickFile * file, // #ifndef NDEBUG // gettimeofday( &tms2, NULL ); -// qDebug("*** LOADING image: %s, took %ld ms", file.latin1(), +// tqDebug("*** LOADING image: %s, took %ld ms", file.latin1(), // (tms2.tv_usec - tms1.tv_usec)/1000); // #endif @@ -655,7 +655,7 @@ KuickImage * ImageCache::getKuimage( KuickFile * file, } if ( kuickList.count() > (uint) myMaxImages ) { -// qDebug(":::: now removing from cache: %s", (*fileList.fromLast()).latin1()); +// tqDebug(":::: now removing from cache: %s", (*fileList.fromLast()).latin1()); kuickList.removeLast(); fileList.remove( fileList.fromLast() ); } diff --git a/kuickshow/src/kuickimage.cpp b/kuickshow/src/kuickimage.cpp index 894a0369..db8065f9 100644 --- a/kuickshow/src/kuickimage.cpp +++ b/kuickshow/src/kuickimage.cpp @@ -47,7 +47,7 @@ void KuickImage::renderPixmap() if ( !myIsDirty ) return; -// qDebug("### rendering: %s", myFilename.latin1()); +// tqDebug("### rendering: %s", myFilename.latin1()); if ( myPixmap ) Imlib_free_pixmap( myId, myPixmap ); @@ -64,7 +64,7 @@ void KuickImage::renderPixmap() // #ifndef NDEBUG // gettimeofday( &tms2, NULL ); -// qDebug("*** rendering image: %s, took %ld ms", myFilename.latin1(), +// tqDebug("*** rendering image: %s, took %ld ms", myFilename.latin1(), // (tms2.tv_usec - tms1.tv_usec)/1000); // #endif @@ -164,7 +164,7 @@ void KuickImage::restoreOriginalSize() if (myWidth == myOrigWidth && myHeight == myOrigHeight) return; -// qDebug("-- restoreOriginalSize"); +// tqDebug("-- restoreOriginalSize"); if ( myOrigIm != 0L ) { @@ -200,7 +200,7 @@ void KuickImage::resize( int width, int height, KuickImage::ResizeMode mode ) void KuickImage::fastResize( int width, int height ) { -// qDebug("-- fastResize: %i x %i", width, height ); +// tqDebug("-- fastResize: %i x %i", width, height ); // lazy resizing (only done when rendering pixmap) myWidth = width; @@ -210,7 +210,7 @@ void KuickImage::fastResize( int width, int height ) bool KuickImage::smoothResize( int newWidth, int newHeight ) { -// qDebug("-- smoothResize: %i x %i", newWidth, newHeight); +// tqDebug("-- smoothResize: %i x %i", newWidth, newHeight); TQImage *image = newTQImage(); // Note: TQ_ScaleMin seems to have a bug (off-by-one, sometimes results in width being 1 pixel too small) @@ -239,7 +239,7 @@ TQImage * KuickImage::newTQImage() const { ImlibImage *im; -// qDebug("-- newTQImage"); +// tqDebug("-- newTQImage"); if ( myOrigIm != 0L && myRotation == ROT_0 && myFlipMode == FlipNone ) { @@ -356,7 +356,7 @@ bool KuickImage::smoothResize( int newWidth, int newHeight ) basis_xx = (int) (4096.0 / scalex); basis_yy = (int) (4096.0 / scaley); - //qDebug("Basis: (%d, %d), (%d, 0), (0, %d)", basis_ox, basis_oy, basis_xx, basis_yy); + //tqDebug("Basis: (%d, %d), (%d, 0), (0, %d)", basis_ox, basis_oy, basis_xx, basis_yy); int x2, y2; diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index 2ac6307a..9c8bdf1e 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -1228,14 +1228,14 @@ void KuickShow::initImlib() if ( !id ) { initImlibParams( idata, &par ); - qWarning("*** KuickShow: Whoops, can't initialize imlib, trying my own palettefile now."); + tqWarning("*** KuickShow: Whoops, can't initialize imlib, trying my own palettefile now."); TQString paletteFile = locate( "data", "kuickshow/im_palette.pal" ); - // ### - does the qstrdup() cure the segfault in imlib eventually? - char *file = qstrdup( paletteFile.local8Bit() ); + // ### - does the tqstrdup() cure the segfault in imlib eventually? + char *file = tqstrdup( paletteFile.local8Bit() ); par.palettefile = file; par.flags |= PARAMS_PALETTEFILE; - qWarning("Palettefile: %s", par.palettefile ); + tqWarning("Palettefile: %s", par.palettefile ); id = Imlib_init_with_params( x11Display(), &par ); diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp index c42d9bf7..ad6a9f9f 100644 --- a/libkscan/kscandevice.cpp +++ b/libkscan/kscandevice.cpp @@ -387,13 +387,13 @@ KScanStat KScanDevice::find_options() #if 0 KScanOption *newOpt = new KScanOption( d->name ); const TQString qq = newOpt->get(); - qDebug( "INIT: <%s> = <%s>", d->name, qq ); + tqDebug( "INIT: <%s> = <%s>", d->name, qq ); allOptionSet->insert( d->name, newOpt ); #endif } else if( d->type == SANE_TYPE_GROUP ) { - // qDebug( "######### Group found: %s ########", d->title ); + // tqDebug( "######### Group found: %s ########", d->title ); } else kdDebug(29000) << "Unable to detect option " << endl; @@ -510,7 +510,7 @@ KScanStat KScanDevice::apply( KScanOption *opt, bool isGammaTable ) kdDebug(29000) << "* Setting status to reload options" << endl; stat = KSCAN_RELOAD; #if 0 - qDebug( "Emitting sigOptionChanged()" ); + tqDebug( "Emitting sigOptionChanged()" ); emit( sigOptionsChanged() ); #endif } @@ -867,7 +867,7 @@ void KScanDevice::prepareScan( void ) while ( it.current() ) { - // qDebug( "%s -> %d", it.currentKey().latin1(), *it.current() ); + // tqDebug( "%s -> %d", it.currentKey().latin1(), *it.current() ); int descriptor = *it.current(); const SANE_Option_Descriptor *d = sane_get_option_descriptor( scanner_handle, descriptor ); @@ -1274,14 +1274,14 @@ void KScanDevice::doProcessABlock( void ) if( goOn && bytes_written < 1 ) { - // qDebug( "No bytes written -> leaving out !" ); + // tqDebug( "No bytes written -> leaving out !" ); goOn = false; /** No more data -> leave ! **/ } if( goOn ) { overall_bytes += bytes_written; - // qDebug( "Bytes read: %d, bytes written: %d", bytes_written, rest_bytes ); + // tqDebug( "Bytes read: %d, bytes written: %d", bytes_written, rest_bytes ); rptr = data; // + rest_bytes; @@ -1333,7 +1333,7 @@ void KScanDevice::doProcessABlock( void ) { chan = (eight_pix & 0x80)> 0 ? 0:1; eight_pix = eight_pix << 1; - //qDebug( "Setting on %d, %d: %d", pixel_x, pixel_y, chan ); + //tqDebug( "Setting on %d, %d: %d", pixel_x, pixel_y, chan ); img->setPixel( pixel_x, pixel_y, chan ); pixel_x++; if( pixel_x >= sane_scan_param.pixels_per_line ) @@ -1417,7 +1417,7 @@ void KScanDevice::doProcessABlock( void ) /* This is also hit after the normal finish of the scan. Most probably, * the TQSocketnotifier fires for a few times after the scan has been - * cancelled. Does it matter ? To see it, just uncomment the qDebug msg. + * cancelled. Does it matter ? To see it, just uncomment the tqDebug msg. */ kdDebug(29000) << "Stopping the scan progress !" << endl; goOn = false; diff --git a/libkscan/kscanoption.cpp b/libkscan/kscanoption.cpp index 43b35d0b..4a820ee9 100644 --- a/libkscan/kscanoption.cpp +++ b/libkscan/kscanoption.cpp @@ -290,7 +290,7 @@ void KScanOption::slWidgetChange( int i ) */ void KScanOption::slRedrawWidget( KScanOption *so ) { - // qDebug( "Checking widget %s", (const char*) so->getName()); + // tqDebug( "Checking widget %s", (const char*) so->getName()); int help = 0; TQString string; @@ -413,7 +413,7 @@ void KScanOption::slReload( void ) KScanOption::~KScanOption() { #ifdef MEM_DEBUG - qDebug( "M: FREEing %d byte of option <%s>", buffer_size, (const char*) getName()); + tqDebug( "M: FREEing %d byte of option <%s>", buffer_size, (const char*) getName()); #endif } @@ -757,7 +757,7 @@ bool KScanOption::set( const TQCString& c_string ) if( buffer_size >= c_string.length() ) { memset( buffer, 0, buffer_size ); - qstrncpy( (char*) buffer, (const char*) c_string, buffer_size ); + tqstrncpy( (char*) buffer, (const char*) c_string, buffer_size ); ret = true; } else @@ -892,7 +892,7 @@ bool KScanOption::get( int *val ) const return( false ); } - // qDebug( "option::get returns %d", *val ); + // tqDebug( "option::get returns %d", *val ); return( true ); } @@ -971,7 +971,7 @@ TQStrList KScanOption::getList( ) const while( *sstring ) { - // qDebug( "This is in the stringlist: %s", *sstring ); + // tqDebug( "This is in the stringlist: %s", *sstring ); strList.append( *sstring ); sstring++; } @@ -1181,7 +1181,7 @@ void *KScanOption::allocBuffer( long size ) if( size < 1 ) return( 0 ); #ifdef MEM_DEBUG - qDebug( "M: Reserving %ld bytes of mem for <%s>", size, (const char*) getName() ); + tqDebug( "M: Reserving %ld bytes of mem for <%s>", size, (const char*) getName() ); #endif void *r = new char[ size ]; |