TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 8 insertions, 8 deletions

diff --git a/konq-plugins/imagerotation/exif.py b/konq-plugins/imagerotation/exif.py
index 309df47..f056b51 100755
--- a/konq-plugins/imagerotation/exif.py
+++ b/konq-plugins/imagerotation/exif.py
@@ -97,7 +97,7 @@ EXIF_TAGS={
     0x010F: ('Make', ),
     0x0110: ('Model', ),
     0x0111: ('StripOffsets', ),
-    0x0112: ('Orientation', ),
+    0x0112: ('Qt::Orientation', ),
     0x0115: ('SamplesPerPixel', ),
     0x0116: ('RowsPerStrip', ),
     0x0117: ('StripByteCounts', ),
@@ -240,7 +240,7 @@ GPS_TAGS={
     0x0006: ('GPSAltitude', ),
     0x0007: ('GPSTimeStamp', ),
     0x0008: ('GPSSatellites', ),
-    0x0009: ('GPSStatus', ),
+    0x0009: ('GPStqStatus', ),
     0x000A: ('GPSMeasureMode', ),
     0x000B: ('GPSDOP', ),
     0x000C: ('GPSSpeedRef', ),
@@ -763,7 +763,7 @@ class EXIF_header:
                 # special case: null-terminated ASCII string
                 if count != 0:
                     self.file.seek(self.offset+offset)
-                    values=self.file.read(count).strip().replace('\x00','')
+                    values=self.file.read(count).strip().tqreplace('\x00','')
                 else:
                     values=''
             elif tag == 0x927C or tag == 0x9286: # MakerNote or UserComment
@@ -811,7 +811,7 @@ class EXIF_header:
                                       repr(self.tags[ifd_name+' '+tag_name]))
 
     # extract uncompressed TIFF thumbnail (like pulling teeth)
-    # we take advantage of the pre-existing layout in the thumbnail IFD as
+    # we take advantage of the pre-existing tqlayout in the thumbnail IFD as
     # much as possible
     def extract_TIFF_thumbnail(self, thumb_ifd):
         entries=self.s2n(thumb_ifd, 2)
diff --git a/konq-plugins/imagerotation/orient.py b/konq-plugins/imagerotation/orient.py
index 0671876..8db06ad 100755
--- a/konq-plugins/imagerotation/orient.py
+++ b/konq-plugins/imagerotation/orient.py
@@ -42,13 +42,13 @@ if not tags:
   print 'no EXIF information in', filename
   sys.exit(1)
 if not tags.has_key('Exif Offset') \
-    or not tags.has_key('Image Orientation'):
+    or not tags.has_key('Image Qt::Orientation'):
   print 'cannot get orientation info in', filename
   sys.exit(1)
 
 exifp = tags['Exif Offset']
 endian = tags['Exif Endian']
-tagp = tags['Image Orientation'].field_offset
+tagp = tags['Image Qt::Orientation'].field_offset
 
 orientp = exifp + tagp
 
@@ -93,8 +93,8 @@ os.write(fd,chr(newo))
 
 # Thumbnail orientation :
 thumb_ifdp = 0
-if tags.has_key('Thumbnail Orientation'):
-  thumb_tagp = tags['Thumbnail Orientation'].field_offset
+if tags.has_key('Thumbnail Qt::Orientation'):
+  thumb_tagp = tags['Thumbnail Qt::Orientation'].field_offset
   thumb_orientp = exifp + thumb_tagp
   if endian == 'M': # MM byte order
     thumb_orientp += 1