diff options
Diffstat (limited to 'kfile-plugins/jpeg')
| -rw-r--r-- | kfile-plugins/jpeg/exif.cpp | 12 | ||||
| -rw-r--r-- | kfile-plugins/jpeg/kfile_jpeg.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kfile-plugins/jpeg/exif.cpp b/kfile-plugins/jpeg/exif.cpp index 6c621477..f4803705 100644 --- a/kfile-plugins/jpeg/exif.cpp +++ b/kfile-plugins/jpeg/exif.cpp @@ -525,11 +525,11 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa switch(Tag){ case TAG_MAKE: - ExifData::CameraMake = TQString::tqfromLatin1((const char*)ValuePtr, 31); + ExifData::CameraMake = TQString::fromLatin1((const char*)ValuePtr, 31); break; case TAG_MODEL: - ExifData::CameraModel = TQString::tqfromLatin1((const char*)ValuePtr, 39); + ExifData::CameraModel = TQString::fromLatin1((const char*)ValuePtr, 39); break; case TAG_ORIENTATION: @@ -537,7 +537,7 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa break; case TAG_DATETIME_ORIGINAL: - DateTime = TQString::tqfromLatin1((const char*)ValuePtr, 19); + DateTime = TQString::fromLatin1((const char*)ValuePtr, 19); break; case TAG_USERCOMMENT: @@ -558,12 +558,12 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa int c; c = (ValuePtr)[a]; if (c != '\0' && c != ' '){ - UserComment = TQString::tqfromLatin1((const char*)(a+ValuePtr), 199); + UserComment = TQString::fromLatin1((const char*)(a+ValuePtr), 199); break; } } }else{ - UserComment = TQString::tqfromLatin1((const char*)ValuePtr, 199); + UserComment = TQString::fromLatin1((const char*)ValuePtr, 199); } break; @@ -803,7 +803,7 @@ void ExifData::process_EXIF(unsigned char * CharBuf, unsigned int length) // printf("Exif section in Motorola order\n"); MotorolaOrder = 1; }else{ - throw FatalError("Invalid Exif tqalignment marker."); + throw FatalError("Invalid Exif alignment marker."); } } diff --git a/kfile-plugins/jpeg/kfile_jpeg.cpp b/kfile-plugins/jpeg/kfile_jpeg.cpp index 5bbd394d..6f187c8e 100644 --- a/kfile-plugins/jpeg/kfile_jpeg.cpp +++ b/kfile-plugins/jpeg/kfile_jpeg.cpp @@ -178,7 +178,7 @@ bool KJpegPlugin::writeInfo( const KFileMetaInfo& info ) const */ /* The jpeg standard does not regulate the contents of the COM block. - I'm assuming the best thing to do here is write as tqunicode utf-8, + I'm assuming the best thing to do here is write as unicode utf-8, which is fully backwards compatible with readers expecting ascii. Readers expecting a national character set are out of luck... */ |