diff options
Diffstat (limited to 'src/gvcore/xpm.cpp')
| -rw-r--r-- | src/gvcore/xpm.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp index 49acb8e..cc2cabc 100644 --- a/src/gvcore/xpm.cpp +++ b/src/gvcore/xpm.cpp @@ -70,9 +70,9 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of TQString s = fileName; if ( !s.isEmpty() ) { int i; - if ( (i = s.tqfindRev('/')) >= 0 ) + if ( (i = s.findRev('/')) >= 0 ) s = s.mid( i ); - if ( (i = s.tqfindRev('\\')) >= 0 ) + if ( (i = s.findRev('\\')) >= 0 ) s = s.mid( i ); TQRegExp r( TQString::tqfromLatin1("[a-zA-Z][a-zA-Z0-9_]*") ); int p = r.search( s ); @@ -132,15 +132,15 @@ static bool read_xpm_string( TQCString &buf, TQIODevice *d, static int nextColorSpec(const TQCString & buf) { - int i = buf.tqfind(" c "); + int i = buf.find(" c "); if (i < 0) - i = buf.tqfind(" g "); + i = buf.find(" g "); if (i < 0) - i = buf.tqfind(" g4 "); + i = buf.find(" g4 "); if (i < 0) - i = buf.tqfind(" m "); + i = buf.find(" m "); if (i < 0) - i = buf.tqfind(" s "); + i = buf.find(" s "); return i; } @@ -165,7 +165,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc d = iio ? iio->ioDevice() : 0; d->readLine( buf.data(), buf.size() ); // "/* XPM */" TQRegExp r( TQString::tqfromLatin1("/\\*.XPM.\\*/") ); - if ( buf.tqfind(r) == -1 ) + if ( buf.find(r) == -1 ) return; // bad magic } else if ( !source ) { return; @@ -361,7 +361,7 @@ static void write_xpm_image( TQImageIO * iio ) TQRgb * yp = (TQRgb *)image.scanLine( y ); for( x=0; x<w; x++ ) { TQRgb color = *(yp + x); - if ( !colorMap.tqcontains(color) ) + if ( !colorMap.contains(color) ) colorMap.insert( color, ncolors++ ); } } |