diff options
Diffstat (limited to 'kimgio')
-rw-r--r-- | kimgio/dds.cpp | 14 | ||||
-rw-r--r-- | kimgio/eps.cpp | 8 | ||||
-rw-r--r-- | kimgio/exr.cpp | 2 | ||||
-rw-r--r-- | kimgio/hdr.cpp | 10 | ||||
-rw-r--r-- | kimgio/ico.cpp | 14 | ||||
-rw-r--r-- | kimgio/jp2.cpp | 6 | ||||
-rw-r--r-- | kimgio/pcx.cpp | 20 | ||||
-rw-r--r-- | kimgio/psd.cpp | 14 | ||||
-rw-r--r-- | kimgio/rgb.cpp | 8 | ||||
-rw-r--r-- | kimgio/tga.cpp | 12 | ||||
-rw-r--r-- | kimgio/tiffr.cpp | 8 | ||||
-rw-r--r-- | kimgio/xcf.cpp | 60 | ||||
-rw-r--r-- | kimgio/xview.cpp | 4 |
13 files changed, 90 insertions, 90 deletions
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp index 1a2edee84..6fee86569 100644 --- a/kimgio/dds.cpp +++ b/kimgio/dds.cpp @@ -910,7 +910,7 @@ namespace { // Private. return false; } - int offset = s.tqdevice()->tqat(); + int offset = s.device()->at(); int size = FaceOffset( header ); for( int i = 0; i < 6; i++ ) { @@ -921,7 +921,7 @@ namespace { // Private. } // Seek device. - s.tqdevice()->tqat( offset ); + s.device()->at( offset ); offset += size; // Load face from stream. @@ -964,7 +964,7 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io ) if( fourcc != FOURCC_DDS ) { kdDebug(399) << "This is not a DDS file." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -976,7 +976,7 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io ) if( s.atEnd() || !IsValid( header ) ) { kdDebug(399) << "This DDS file is not valid." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -984,7 +984,7 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io ) if( !IsSupported( header ) ) { kdDebug(399) << "This DDS file is not supported." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -1002,12 +1002,12 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io ) if( result == false ) { kdDebug(399) << "Error loading DDS file." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } io->setImage( img ); - io->seStatus( 0 ); + io->setStatus( 0 ); } diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp index 9e3b14163..60aa616a0 100644 --- a/kimgio/eps.cpp +++ b/kimgio/eps.cpp @@ -61,7 +61,7 @@ static bool seekToCodeStart( TQIODevice * io, TQ_UINT32 & ps_offset, TQ_UINT32 & + ((unsigned char) buf[2] << 16) + ((unsigned char) buf[3] << 24); kdDebug(399) << "kimgio EPS: Offset: " << ps_offset <<" Size: " << ps_size << endl; - if ( !io->tqat(ps_offset) ) // Get offset of PostScript code in the MS-DOS EPS file. + if ( !io->at(ps_offset) ) // Get offset of PostScript code in the MS-DOS EPS file. { kdError(399) << "kimgio EPS: cannot seek in MS-DOS EPS file" << endl; return false; @@ -218,7 +218,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image) io->reset(); // Go back to start of file to give all the file to GhostScript if (ps_offset>0L) // We have an offset - io->tqat(ps_offset); + io->at(ps_offset); TQByteArray buffer ( io->readAll() ); // If we have no MS-DOS EPS file or if the size seems wrong, then choose the buffer size @@ -234,7 +234,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image) TQImage myimage; if( myimage.load (tmpFile.name()) ) { image->setImage (myimage); - image->seStatus (0); + image->setStatus (0); kdDebug(399) << "kimgio EPS: success!" << endl; } else @@ -290,5 +290,5 @@ KDE_EXPORT void kimgio_eps_write( TQImageIO *imageio ) inFile.close(); - imageio->seStatus(0); + imageio->setStatus(0); } diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp index 88b3fbbbe..c28cb799b 100644 --- a/kimgio/exr.cpp +++ b/kimgio/exr.cpp @@ -148,7 +148,7 @@ KDE_EXPORT void kimgio_exr_read( TQImageIO *io ) } io->setImage( image ); - io->seStatus( 0 ); + io->setStatus( 0 ); } catch (const std::exception &exc) { diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp index 99bcccbbf..82cba5c12 100644 --- a/kimgio/hdr.cpp +++ b/kimgio/hdr.cpp @@ -127,7 +127,7 @@ namespace { // Private. if (val != 2) { - s.tqdevice()->tqat( s.tqdevice()->tqat() - 1 ); + s.device()->at( s.device()->at() - 1 ); Read_Old_Line(image.data(), width, s); RGBE_To_QRgbLine(image.data(), scanline, width); continue; @@ -225,7 +225,7 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io ) { kdDebug(399) << "Unknown HDR format." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -238,7 +238,7 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io ) { kdDebug(399) << "Invalid HDR file." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -249,12 +249,12 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io ) { kdDebug(399) << "Error loading HDR file." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } io->setImage( img ); - io->seStatus( 0 ); + io->setStatus( 0 ); } diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp index f2aa52d69..befff6dd3 100644 --- a/kimgio/ico.cpp +++ b/kimgio/ico.cpp @@ -243,7 +243,7 @@ namespace extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io ) { - TQIODevice::Offset offset = io->ioDevice()->tqat(); + TQIODevice::Offset offset = io->ioDevice()->at(); TQDataStream stream( io->ioDevice() ); stream.setByteOrder( TQDataStream::LittleEndian ); @@ -295,7 +295,7 @@ extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io ) offset + selected->offset > io->ioDevice()->size() ) return; - io->ioDevice()->tqat( offset + selected->offset ); + io->ioDevice()->at( offset + selected->offset ); TQImage icon; if ( loadFromDIB( stream, *selected, icon ) ) { @@ -306,7 +306,7 @@ extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io ) icon.setText( "X-HotspotY", 0, TQString::number( selected->hotspotY ) ); } io->setImage(icon); - io->seStatus(0); + io->setStatus(0); } } @@ -334,7 +334,7 @@ void kimgio_ico_write(TQImageIO *io) if (!qt_write_dib(dib, pixels)) return; - uint hdrPos = dib.device()->tqat(); + uint hdrPos = dib.device()->at(); if (!qt_write_dib(dib, mask)) return; memmove(dibData.data() + hdrPos, dibData.data() + hdrPos + BMP_WIN + 8, dibData.size() - hdrPos - BMP_WIN - 8); @@ -361,14 +361,14 @@ void kimgio_ico_write(TQImageIO *io) rec.dibSize = dibData.size(); ico << rec.width << rec.height << rec.colors << rec.hotspotX << rec.hotspotY << rec.dibSize; - rec.dibOffset = ico.device()->tqat() + sizeof(rec.dibOffset); + rec.dibOffset = ico.device()->at() + sizeof(rec.dibOffset); ico << rec.dibOffset; BMP_INFOHDR dibHeader; - dib.device()->tqat(0); + dib.device()->at(0); dib >> dibHeader; dibHeader.biHeight = io->image().height() << 1; - dib.device()->tqat(0); + dib.device()->at(0); dib << dibHeader; ico.writeRawBytes(dibData.data(), dibData.size()); diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp index 4e74211e8..2200c948c 100644 --- a/kimgio/jp2.cpp +++ b/kimgio/jp2.cpp @@ -163,7 +163,7 @@ kimgio_jp2_read( TQImageIO* io ) if( gs.altimage ) jas_image_destroy( gs.altimage ); io->setImage( image ); - io->seStatus( 0 ); + io->setStatus( 0 ); } // kimgio_jp2_read @@ -291,7 +291,7 @@ kimgio_jp2_write( TQImageIO* io ) TQ_LONG size; // seek to the beginning of the file. - if( !in->tqat( 0 ) ) { delete ktempf; return; } + if( !in->at( 0 ) ) { delete ktempf; return; } // 0 or -1 is EOF / error while( ( size = in->readBlock( b.data(), 4096 ) ) > 0 ) { @@ -309,7 +309,7 @@ kimgio_jp2_write( TQImageIO* io ) // everything went fine - io->seStatus( IO_Ok ); + io->setStatus( IO_Ok ); } // kimgio_jp2_write #endif // HAVE_JASPER diff --git a/kimgio/pcx.cpp b/kimgio/pcx.cpp index bda7ef495..53ef4fe2c 100644 --- a/kimgio/pcx.cpp +++ b/kimgio/pcx.cpp @@ -46,7 +46,7 @@ static TQDataStream &operator>>( TQDataStream &s, PCXHEADER &ph ) // Skip the rest of the header TQ_UINT8 byte; - while ( s.tqdevice()->tqat() < 128 ) + while ( s.device()->at() < 128 ) s >> byte; return s; @@ -183,7 +183,7 @@ static void readImage4( TQImage &img, TQDataStream &s, const PCXHEADER &header ) TQ_UINT32 offset = i*header.BytesPerLine; for ( unsigned int x=0; x<header.width(); ++x ) if ( buf[ offset + ( x/8 ) ] & ( 128 >> ( x%8 ) ) ) - pixbuf[ x ] = static_cast<const char>(pixbuf.tqat(x)) + ( 1 << i ); + pixbuf[ x ] = static_cast<const char>(pixbuf.at(x)) + ( 1 << i ); } uchar *p = img.scanLine( y ); @@ -267,9 +267,9 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io ) TQDataStream s( io->ioDevice() ); s.setByteOrder( TQDataStream::LittleEndian ); - if ( s.tqdevice()->size() < 128 ) + if ( s.device()->size() < 128 ) { - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -279,7 +279,7 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io ) if ( header.Manufacturer != 10 || s.atEnd()) { - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -323,11 +323,11 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io ) if ( !img.isNull() ) { io->setImage( img ); - io->seStatus( 0 ); + io->setStatus( 0 ); } else { - io->seStatus( -1 ); + io->setStatus( -1 ); } } @@ -343,7 +343,7 @@ static void writeLine( TQDataStream &s, TQByteArray &buf ) count = 1; byte = buf[ i++ ]; - while ( ( i < size ) && ( TQChar(byte) == buf.tqat(i) ) && ( count < 63 ) ) + while ( ( i < size ) && ( TQChar(byte) == buf.at(i) ) && ( count < 63 ) ) { ++i; ++count; @@ -412,7 +412,7 @@ static void writeImage4( TQImage &img, TQDataStream &s, PCXHEADER &header ) { for ( int i=0; i<4; ++i ) if ( *( p+x ) & ( 1 << i ) ) - buf[ i ][ x/8 ] = buf[ i ].tqat(x/8) | 1 << ( 7-x%8 ); + buf[ i ][ x/8 ] = buf[ i ].at(x/8) | 1 << ( 7-x%8 ); } for ( int i=0; i<4; ++i ) @@ -526,7 +526,7 @@ KDE_EXPORT void kimgio_pcx_write( TQImageIO *io ) writeImage24( img, s, header ); } - io->seStatus( 0 ); + io->setStatus( 0 ); } /* vim: et sw=2 ts=2 diff --git a/kimgio/psd.cpp b/kimgio/psd.cpp index 5fa0d81a1..8859d1541 100644 --- a/kimgio/psd.cpp +++ b/kimgio/psd.cpp @@ -119,15 +119,15 @@ namespace { // Private. // Skip mode data. s >> tmp; - s.tqdevice()->tqat( s.tqdevice()->tqat() + tmp ); + s.device()->at( s.device()->at() + tmp ); // Skip image resources. s >> tmp; - s.tqdevice()->tqat( s.tqdevice()->tqat() + tmp ); + s.device()->at( s.device()->at() + tmp ); // Skip the reserved data. s >> tmp; - s.tqdevice()->tqat( s.tqdevice()->tqat() + tmp ); + s.device()->at( s.device()->at() + tmp ); // Find out if the data is compressed. // Known values: @@ -250,7 +250,7 @@ void kimgio_psd_read( TQImageIO *io ) if( s.atEnd() || !IsValid( header ) ) { kdDebug(399) << "This PSD file is not valid." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -258,7 +258,7 @@ void kimgio_psd_read( TQImageIO *io ) if( !IsSupported( header ) ) { kdDebug(399) << "This PSD file is not supported." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -266,12 +266,12 @@ void kimgio_psd_read( TQImageIO *io ) if( !LoadPSD(s, header, img) ) { kdDebug(399) << "Error loading PSD file." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } io->setImage( img ); - io->seStatus( 0 ); + io->setStatus( 0 ); } diff --git a/kimgio/rgb.cpp b/kimgio/rgb.cpp index 68da172fb..ae2439083 100644 --- a/kimgio/rgb.cpp +++ b/kimgio/rgb.cpp @@ -38,12 +38,12 @@ KDE_EXPORT void kimgio_rgb_read(TQImageIO *io) if (!sgi.readImage(img)) { io->setImage(TQImage()); - io->seStatus(-1); + io->setStatus(-1); return; } io->setImage(img); - io->seStatus(0); + io->setStatus(0); } @@ -53,9 +53,9 @@ KDE_EXPORT void kimgio_rgb_write(TQImageIO *io) TQImage img = io->image(); if (!sgi.writeImage(img)) - io->seStatus(-1); + io->setStatus(-1); - io->seStatus(0); + io->setStatus(0); } diff --git a/kimgio/tga.cpp b/kimgio/tga.cpp index 0a90aa514..3a9d88515 100644 --- a/kimgio/tga.cpp +++ b/kimgio/tga.cpp @@ -324,13 +324,13 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io ) // Read image header. TgaHeader tga; s >> tga; - s.tqdevice()->tqat( TgaHeader::SIZE + tga.id_length ); + s.device()->at( TgaHeader::SIZE + tga.id_length ); // Check image file format. if( s.atEnd() ) { kdDebug(399) << "This TGA file is not valid." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -338,7 +338,7 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io ) if( !IsSupported(tga) ) { kdDebug(399) << "This TGA file is not supported." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -349,13 +349,13 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io ) if( result == false ) { kdDebug(399) << "Error loading TGA file." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } io->setImage( img ); - io->seStatus( 0 ); + io->setStatus( 0 ); } @@ -385,6 +385,6 @@ KDE_EXPORT void kimgio_tga_write( TQImageIO *io ) s << TQ_UINT8( tqAlpha( color ) ); } - io->seStatus( 0 ); + io->setStatus( 0 ); } diff --git a/kimgio/tiffr.cpp b/kimgio/tiffr.cpp index 65c950dcd..5f319e6b5 100644 --- a/kimgio/tiffr.cpp +++ b/kimgio/tiffr.cpp @@ -30,14 +30,14 @@ static toff_t tiff_seek( thandle_t handle, toff_t off, int whence ) TQIODevice *dev = reinterpret_cast<TQIODevice *>( handle ); if ( whence == SEEK_CUR ) - off += dev->tqat(); + off += dev->at(); else if ( whence == SEEK_END ) off += dev->size(); - if ( !dev->tqat( off ) ) + if ( !dev->at( off ) ) return ( toff_t )-1; - return dev->tqat(); + return dev->at(); } static toff_t tiff_size( thandle_t handle ) @@ -140,7 +140,7 @@ KDE_EXPORT void kimgio_tiff_read( TQImageIO *io ) TIFFClose( tiff ); io->setImage( image ); - io->seStatus ( 0 ); + io->setStatus ( 0 ); } KDE_EXPORT void kimgio_tiff_write( TQImageIO * ) diff --git a/kimgio/xcf.cpp b/kimgio/xcf.cpp index 6a87ec237..252b3e036 100644 --- a/kimgio/xcf.cpp +++ b/kimgio/xcf.cpp @@ -42,7 +42,7 @@ KDE_EXPORT void kimgio_xcf_read(TQImageIO *io) KDE_EXPORT void kimgio_xcf_write(TQImageIO *io) { kdDebug(399) << "XCF: write support not implemented" << endl; - io->seStatus(-1); + io->setStatus(-1); } /////////////////////////////////////////////////////////////////////////////// @@ -127,14 +127,14 @@ void XCFImageFormat::readXCF(TQImageIO *io) char tag[14]; xcf_io.readRawBytes(tag, sizeof(tag)); - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on header tag" << endl; return; } xcf_io >> xcf_image.width >> xcf_image.height >> xcf_image.type; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on image info" << endl; return; } @@ -156,7 +156,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " << xcf_io >> layer_offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer offsets" << endl; return; } @@ -178,7 +178,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " << while (!layer_offsets.isEmpty()) { TQ_INT32 layer_offset = layer_offsets.pop(); - xcf_io.tqdevice()->tqat(layer_offset); + xcf_io.device()->at(layer_offset); if (!loadLayer(xcf_io, xcf_image)) return; @@ -190,7 +190,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " << } io->setImage(xcf_image.image); - io->seStatus(0); + io->setStatus(0); } @@ -294,7 +294,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr xcf_io >> foo; type=PropType(foo); // TODO urks - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property type" << type << endl; return false; } @@ -309,7 +309,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr if (type == PROP_COLORMAP) { xcf_io >> size; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << " size" << endl; return false; } @@ -329,7 +329,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr xcf_io >> size >> factor >> digits; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << endl; return false; } @@ -337,7 +337,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr for (int i = 0; i < 5; i++) { xcf_io >> unit_strings; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << endl; return false; } @@ -354,7 +354,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr xcf_io.readRawBytes(data, size); } - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << " data, size " << size << endl; return false; } @@ -382,7 +382,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) xcf_io >> layer.width >> layer.height >> layer.type >> layer.name; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer" << endl; return false; } @@ -405,7 +405,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) // If there are any more layers, merge them into the final TQImage. xcf_io >> layer.hierarchy_offset >> layer.mask_offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer image offsets" << endl; return false; } @@ -415,7 +415,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) if( !composeTiles(xcf_image)) return false; - xcf_io.tqdevice()->tqat(layer.hierarchy_offset); + xcf_io.device()->at(layer.hierarchy_offset); // As tiles are loaded, they are copied into the layers tiles by // this routine. (loadMask(), below, uses a slightly different @@ -427,7 +427,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) return false; if (layer.mask_offset != 0) { - xcf_io.tqdevice()->tqat(layer.mask_offset); + xcf_io.device()->at(layer.mask_offset); if (!loadMask(xcf_io, layer)) return false; @@ -739,7 +739,7 @@ bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer) xcf_io >> width >> height >> bpp >> offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " image header" << endl; return false; } @@ -752,19 +752,19 @@ bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer) do { xcf_io >> junk; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level offsets" << endl; return false; } } while (junk != 0); - TQIODevice::Offset saved_pos = xcf_io.tqdevice()->tqat(); + TQIODevice::Offset saved_pos = xcf_io.device()->at(); - xcf_io.tqdevice()->tqat(offset); + xcf_io.device()->at(offset); if (!loadLevel(xcf_io, layer, bpp)) return false; - xcf_io.tqdevice()->tqat(saved_pos); + xcf_io.device()->at(saved_pos); return true; } @@ -785,7 +785,7 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) xcf_io >> width >> height >> offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level info" << endl; return false; } @@ -801,11 +801,11 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) return false; } - TQIODevice::Offset saved_pos = xcf_io.tqdevice()->tqat(); + TQIODevice::Offset saved_pos = xcf_io.device()->at(); TQ_UINT32 offset2; xcf_io >> offset2; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level offset look-ahead" << endl; return false; } @@ -815,7 +815,7 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) if (offset2 == 0) offset2 = offset + (uint)(TILE_WIDTH * TILE_HEIGHT * 4 * 1.5); - xcf_io.tqdevice()->tqat(offset); + xcf_io.device()->at(offset); int size = layer.image_tiles[j][i].width() * layer.image_tiles[j][i].height(); if (!loadTileRLE(xcf_io, layer.tile, size, offset2 - offset, bpp)) @@ -827,10 +827,10 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) layer.assignBytes(layer, i, j); - xcf_io.tqdevice()->tqat(saved_pos); + xcf_io.device()->at(saved_pos); xcf_io >> offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level offset" << endl; return false; } @@ -855,7 +855,7 @@ bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer) xcf_io >> width >> height >> name; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on mask info" << endl; return false; } @@ -868,12 +868,12 @@ bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer) TQ_UINT32 hierarchy_offset; xcf_io >> hierarchy_offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on mask image offset" << endl; return false; } - xcf_io.tqdevice()->tqat(hierarchy_offset); + xcf_io.device()->at(hierarchy_offset); layer.assignBytes = assignMaskBytes; if (!loadHierarchy(xcf_io, layer)) @@ -919,7 +919,7 @@ bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_si xcf_io.readRawBytes((char*)xcfdata, data_length); - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { delete[] xcfodata; kdDebug(399) << "XCF: read failure on tile" << endl; return false; diff --git a/kimgio/xview.cpp b/kimgio/xview.cpp index 4d4fd6465..1e5fb4000 100644 --- a/kimgio/xview.cpp +++ b/kimgio/xview.cpp @@ -94,7 +94,7 @@ KDE_EXPORT void kimgio_xv_read( TQImageIO *_imageio ) } _imageio->setImage( image ); - _imageio->seStatus( 0 ); + _imageio->setStatus( 0 ); free(block); return; @@ -164,6 +164,6 @@ KDE_EXPORT void kimgio_xv_write( TQImageIO *imageio ) } delete[] buffer; - imageio->seStatus( 0 ); + imageio->setStatus( 0 ); } |