Changeset 6226

Timestamp:

05/29/08 02:57:12 (6 months ago)

Author:

flynd

Message:

Added const to translator functions so we can call it from const context. iconv() doesn't declare it's inbuf parameter as const but it doesn't change the data so it's safe to const_cast it.

Location:

trunk/licq

Files:

• include/licq_translate.h (modified) (2 diffs)
• src/translate.cpp (modified) (6 diffs)

trunk/licq/include/licq_translate.h

@@ -34 +34 @@
   char* nameForIconv(const char* licqName);
 
-  char* ToUnicode(char* array, const char* fromEncoding = "");
-  char* FromUnicode(char* array, const char* toEncoding = "");
+  char* ToUnicode(const char* array, const char* fromEncoding = "");
+  char* FromUnicode(const char* array, const char* toEncoding = "");
 
-  char* FromUTF16(char* array, const char* toEncoding, int length = -1);
-  char* ToUTF16(char* array, const char* fromEncoding, size_t& outDone);
+  char* FromUTF16(const char* array, const char* toEncoding, int length = -1);
+  char* ToUTF16(const char* array, const char* fromEncoding, size_t& outDone);
 
   char* NToRN(const char* array);
@@ -52 +52 @@
   unsigned char clientToServerTab[256];
 
-  char* iconvConvert(char* array, const char* to, const char* from, bool& ok,
-      int length = -1, size_t* outDone = NULL);
+  char* iconvConvert(const char* array, const char* to, const char* from,
+      bool& ok, int length = -1, size_t* outDone = NULL);
 };
 

trunk/licq/src/translate.cpp

@@ -232 +232 @@
 }
 
-char* CTranslator::ToUnicode(char* array, const char* fromEncoding)
+char* CTranslator::ToUnicode(const char* array, const char* fromEncoding)
 {
   if (array == NULL)
@@ -257 +257 @@
 }
 
-char* CTranslator::FromUnicode(char* array, const char* toEncoding)
+char* CTranslator::FromUnicode(const char* array, const char* toEncoding)
 {
   if (array == NULL)
@@ -277 +277 @@
 }
 
-char* CTranslator::FromUTF16(char* array, const char* toEncoding, int length)
+char* CTranslator::FromUTF16(const char* array, const char* toEncoding, int length)
 {
   if (array == NULL)
@@ -297 +297 @@
 }
 
-char* CTranslator::ToUTF16(char* array, const char* fromEncoding, size_t& outDone)
+char* CTranslator::ToUTF16(const char* array, const char* fromEncoding, size_t& outDone)
 {
   if (array == NULL)
@@ -439 +439 @@
 }
 
-char* CTranslator::iconvConvert(char* array, const char* to, const char* from,
+char* CTranslator::iconvConvert(const char* array, const char* to, const char* from,
     bool& ok, int length, size_t* outDone)
 {
@@ -456 +456 @@
   char* result = new char[outLen + 1];
 
-  char* inPtr = array;
+  // iconv() has inbuf parameter declared as char** even though the data is
+  // never modified so it's safe to cast away the const here.
+  char* inPtr = const_cast<char*>(array);
   char* outPtr = result;
   iconv_t tr;