TQt4 convert k9copy

This enables compilation under both Qt3 and Qt4


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

5 files changed, 20 insertions, 20 deletions

diff --git a/libdvdnav/decoder.c b/libdvdnav/decoder.c
index 1c21f60..9586b30 100644
--- a/libdvdnav/decoder.c
+++ b/libdvdnav/decoder.c
@@ -35,7 +35,7 @@
 
 uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) {
   uint64_t result = 0;
-  uint64_t bit_mask = 0;
+  uint64_t bit_tqmask = 0;
   uint64_t examining = 0;
   int32_t  bits;
   
@@ -50,12 +50,12 @@ uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) {
     abort();
   }
   /* all ones, please */
-  bit_mask = ~bit_mask;
-  bit_mask >>= 63 - start;
+  bit_tqmask = ~bit_tqmask;
+  bit_tqmask >>= 63 - start;
   bits = start + 1 - count;
-  examining = ((bit_mask >> bits) << bits );
+  examining = ((bit_tqmask >> bits) << bits );
   command->examined |= examining;
-  result = (command->instruction & bit_mask) >> bits;
+  result = (command->instruction & bit_tqmask) >> bits;
   return (uint32_t) result;
 }
 
@@ -217,11 +217,11 @@ static int32_t eval_special_instruction(command_t* command, int32_t cond) {
       /*  max number of rows < 256, so we will end this set */
       line = 256;
       return cond ? 256 : 0;
-    case 3: /*  Set temporary parental level and goto */
+    case 3: /*  Set temporary tqparental level and goto */
       line = vm_getbits(command, 7, 8); 
       level = vm_getbits(command, 11, 4);
       if(cond) {
-	/*  This always succeeds now, if we want real parental protection */
+	/*  This always succeeds now, if we want real tqparental protection */
 	/*  we need to ask the user and have passwords and stuff. */
 	command->registers->SPRM[13] = level;
       }
diff --git a/libdvdnav/dvdnav.h b/libdvdnav/dvdnav.h
index 1e39d0b..b8618d9 100644
--- a/libdvdnav/dvdnav.h
+++ b/libdvdnav/dvdnav.h
@@ -52,7 +52,7 @@ extern "C" {
  */
 typedef struct dvdnav_s dvdnav_t;
 
-/* Status as reported by most of libdvdnav's functions */
+/* tqStatus as reported by most of libdvdnav's functions */
 typedef int32_t dvdnav_status_t;
 
 /*
@@ -120,22 +120,22 @@ int64_t dvdnav_convert_time(dvd_time_t *time);
  */
 
 /*
- * Sets the region mask (bit 0 set implies region 1, bit 1 set implies
+ * Sets the region tqmask (bit 0 set implies region 1, bit 1 set implies
  * region 2, etc) of the virtual machine. Generally you will only need to set
  * this if you are playing RCE discs which query the virtual machine as to its
  * region setting. 
  *
  * This has _nothing_ to do with the region setting of the DVD drive.
  */
-dvdnav_status_t dvdnav_set_region_mask(dvdnav_t *self, int32_t region_mask);
+dvdnav_status_t dvdnav_set_region_tqmask(dvdnav_t *self, int32_t region_tqmask);
 
 /*
- * Returns the region mask (bit 0 set implies region 1, bit 1 set implies
+ * Returns the region tqmask (bit 0 set implies region 1, bit 1 set implies
  * region 2, etc) of the virtual machine.
  *
  * This has _nothing_ to do with the region setting of the DVD drive.
  */
-dvdnav_status_t dvdnav_get_region_mask(dvdnav_t *self, int32_t *region_mask);
+dvdnav_status_t dvdnav_get_region_tqmask(dvdnav_t *self, int32_t *region_tqmask);
 
 /*
  * Specify whether read-ahead caching should be used. You may not want this if your
diff --git a/libdvdnav/read_cache.c b/libdvdnav/read_cache.c
index 1941c3c..685a440 100644
--- a/libdvdnav/read_cache.c
+++ b/libdvdnav/read_cache.c
@@ -47,7 +47,7 @@
 
 typedef struct read_cache_chunk_s {
   uint8_t     *cache_buffer;
-  uint8_t     *cache_buffer_base;  /* used in malloc and free for alignment */
+  uint8_t     *cache_buffer_base;  /* used in malloc and free for tqalignment */
   int32_t      cache_start_sector; /* -1 means cache invalid */
   int32_t      cache_read_count;   /* this many sectors are already read */
   size_t       cache_block_count;  /* this many sectors will go in this chunk */
diff --git a/libdvdnav/settings.c b/libdvdnav/settings.c
index 4af8aea..a760b96 100644
--- a/libdvdnav/settings.c
+++ b/libdvdnav/settings.c
@@ -29,7 +29,7 @@
 
 /* Characteristics/setting API calls */
 
-dvdnav_status_t dvdnav_get_region_mask(dvdnav_t *this, int32_t *region) {
+dvdnav_status_t dvdnav_get_region_tqmask(dvdnav_t *this, int32_t *region) {
   if(!this || !region) {
     printerr("Passed a NULL this pointer.");
     return DVDNAV_STATUS_ERR;
@@ -39,14 +39,14 @@ dvdnav_status_t dvdnav_get_region_mask(dvdnav_t *this, int32_t *region) {
   return DVDNAV_STATUS_OK;
 }
 
-dvdnav_status_t dvdnav_set_region_mask(dvdnav_t *this, int32_t mask) {
+dvdnav_status_t dvdnav_set_region_tqmask(dvdnav_t *this, int32_t tqmask) {
   if(!this) {
     printerr("Passed a NULL this pointer.");
     return DVDNAV_STATUS_ERR;
   }
 
   pthread_mutex_lock(&this->vm_lock);
-  this->vm->state.registers.SPRM[20] = (mask & 0xff);
+  this->vm->state.registers.SPRM[20] = (tqmask & 0xff);
   pthread_mutex_unlock(&this->vm_lock);
   return DVDNAV_STATUS_OK;
 }
diff --git a/libdvdnav/vm.c b/libdvdnav/vm.c
index dbebafa..0df5f0b 100644
--- a/libdvdnav/vm.c
+++ b/libdvdnav/vm.c
@@ -359,11 +359,11 @@ int vm_reset(vm_t *vm, const char *dvdroot) {
     /* ifoRead_TXTDT_MGI(vmgi); Not implemented yet */
   }
   if (vm->vmgi) {
-    int i, mask;
-    fprintf(MSG_OUT, "libdvdnav: DVD disk reports itself with Region mask 0x%08x. Regions:",
+    int i, tqmask;
+    fprintf(MSG_OUT, "libdvdnav: DVD disk reports itself with Region tqmask 0x%08x. Regions:",
       vm->vmgi->vmgi_mat->vmg_category);
-    for (i = 1, mask = 1; i <= 8; i++, mask <<= 1)
-      if (((vm->vmgi->vmgi_mat->vmg_category >> 16) & mask) == 0)
+    for (i = 1, tqmask = 1; i <= 8; i++, tqmask <<= 1)
+      if (((vm->vmgi->vmgi_mat->vmg_category >> 16) & tqmask) == 0)
         fprintf(MSG_OUT, " %d", i);
     fprintf(MSG_OUT, "\n");
   }