diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:00 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:00 -0600 |
| commit | ec1fddcd0d6663ad273af85357f04abbc5689468 (patch) | |
| tree | 6cb946ab8b4771868c6eee8d1aa5213d6ec246e2 /kfile-plugins/jpeg | |
| parent | c2637a0da6d9a1c8626ca39f8451ab3b7cda487a (diff) | |
| download | tdegraphics-ec1fddcd0d6663ad273af85357f04abbc5689468.tar.gz tdegraphics-ec1fddcd0d6663ad273af85357f04abbc5689468.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.
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 f4803705..6c621477 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::fromLatin1((const char*)ValuePtr, 31); + ExifData::CameraMake = TQString::tqfromLatin1((const char*)ValuePtr, 31); break; case TAG_MODEL: - ExifData::CameraModel = TQString::fromLatin1((const char*)ValuePtr, 39); + ExifData::CameraModel = TQString::tqfromLatin1((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::fromLatin1((const char*)ValuePtr, 19); + DateTime = TQString::tqfromLatin1((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::fromLatin1((const char*)(a+ValuePtr), 199); + UserComment = TQString::tqfromLatin1((const char*)(a+ValuePtr), 199); break; } } }else{ - UserComment = TQString::fromLatin1((const char*)ValuePtr, 199); + UserComment = TQString::tqfromLatin1((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 alignment marker."); + throw FatalError("Invalid Exif tqalignment marker."); } } diff --git a/kfile-plugins/jpeg/kfile_jpeg.cpp b/kfile-plugins/jpeg/kfile_jpeg.cpp index 6f187c8e..5bbd394d 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 unicode utf-8, + I'm assuming the best thing to do here is write as tqunicode utf-8, which is fully backwards compatible with readers expecting ascii. Readers expecting a national character set are out of luck... */ |