Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.

3 files changed, 12 insertions, 12 deletions

diff --git a/kscd/libwm/cdtext.c b/kscd/libwm/cdtext.c
index bb4e19b8..fafd039f 100644
--- a/kscd/libwm/cdtext.c
+++ b/kscd/libwm/cdtext.c
@@ -21,8 +21,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#ifdef libunicode
-  #include <unicode.h>
+#ifdef libtqunicode
+  #include <tqunicode.h>
 #endif
 
 #include "include/wm_config.h"
@@ -155,12 +155,12 @@ void get_data_from_cdtext_pack(
   int arr = pack->header_field_id2_tracknumber;
   int i;
   int language_block;
-  int unicode;
+  int tqunicode;
 
   language_block = (pack->header_field_id4_block_no >> 4) & 0x07;
-  unicode = pack->header_field_id4_block_no & 0x80;
+  tqunicode = pack->header_field_id4_block_no & 0x80;
 
-  if(!unicode)
+  if(!tqunicode)
   {
     for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i++)
     {
@@ -180,7 +180,7 @@ void get_data_from_cdtext_pack(
       }
     }
   }
-#ifdef libunicode
+#ifdef libtqunicode
   else /* doublebytes ;-) */
   {
     for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i += 2)
@@ -203,7 +203,7 @@ void get_data_from_cdtext_pack(
   }
 #else
   else {
-     wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle unicode");
+     wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle tqunicode");
   }
 #endif
 }
@@ -315,9 +315,9 @@ get_glob_cdtext(struct wm_drive *d, int redo)
             {
               wm_cdtext_info.blocks[j] = lp_block;
               wm_cdtext_info.blocks[j]->block_code = code;
-              wm_cdtext_info.blocks[j]->block_unicode = pack->header_field_id4_block_no & 0x80;
+              wm_cdtext_info.blocks[j]->block_tqunicode = pack->header_field_id4_block_no & 0x80;
               wm_lib_message(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS,
-                "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_unicode?"doublebyte":"singlebyte");
+                "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_tqunicode?"doublebyte":"singlebyte");
 /*
   unsigned char block_encoding; not jet!
   cdtext_string* block_encoding_text;
diff --git a/kscd/libwm/include/wm_cdtext.h b/kscd/libwm/include/wm_cdtext.h
index e843ee95..ba481be0 100644
--- a/kscd/libwm/include/wm_cdtext.h
+++ b/kscd/libwm/include/wm_cdtext.h
@@ -44,7 +44,7 @@ typedef unsigned char cdtext_string[MAX_LENGHT_OF_CDTEXT_STRING];
 struct cdtext_info_block {
   /* management */
   unsigned char block_code;
-  unsigned char block_unicode; /* 0 - single chars, 1 - doublebytes */
+  unsigned char block_tqunicode; /* 0 - single chars, 1 - doublebytes */
   unsigned char block_encoding; /* orange book -? */
   cdtext_string* block_encoding_text;
 
diff --git a/kscd/libwm/plat_news.c b/kscd/libwm/plat_news.c
index 4b9f2ef7..304ebfda 100644
--- a/kscd/libwm/plat_news.c
+++ b/kscd/libwm/plat_news.c
@@ -181,7 +181,7 @@ int
 gen_get_drive_status( struct wm_drive *d, int oldmode, 
 		      int *mode, int *pos, int *track, int *index)
 {
-  struct CD_Status		sc;
+  struct CD_tqStatus		sc;
 
   /* If we can't get status, the CD is ejected, so default to that. */
   *mode = WM_CDM_EJECTED;
@@ -199,7 +199,7 @@ gen_get_drive_status( struct wm_drive *d, int oldmode,
     }
   
   /* Disc is ejected.  Close the device. */
-  if (CD_GetStatus(d->fd, &sc))
+  if (CD_GettqStatus(d->fd, &sc))
     {
       gen_close(d);
       return (0);