Changeset 632 for trunk/tools/assistant/lib/fulltextsearch/qclucene_global_p.h

Timestamp:

Mar 5, 2010, 1:38:54 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty/clucene: Made it build in _ASCII mode.

File:

• trunk/tools/assistant/lib/fulltextsearch/qclucene_global_p.h (modified) (3 diffs)

trunk/tools/assistant/lib/fulltextsearch/qclucene_global_p.h

@@ -37 +37 @@
 #include <QtCore/QString>
 
-#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+#if !defined(_MSC_VER)
 #   if !defined(TCHAR)
-#       define TCHAR wchar_t
+#       if defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T) && !defined(_ASCII)
+#           define TCHAR wchar_t
+#       else
+#           define TCHAR char
+#       endif
 #   endif
 #else
@@ -61 +65 @@
 //  -------------
 //
-// adjustments here, need to be done in 
+// adjustments here, need to be done in
 // QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
 //
@@ -106 +110 @@
     TCHAR* QStringToTChar(const QString &str)
     {
-        TCHAR *string = new TCHAR[(str.length() +1) * sizeof(TCHAR)];
-        memset(string, 0, (str.length() +1) * sizeof(TCHAR));
-        #if defined(UNICODE) || defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+        
+        ;
+        
             str.toWCharArray(string);
+
         #else
-            const QByteArray ba = str.toAscii();
+            const QByteArray ba = str.toLocal8Bit();
+            char *string = new char[ba.length() + 1];
             strcpy(string, ba.constData());
+
         #endif
-        return string;
     }
 
-    QString TCharToQString(const TCHAR *string)
+     TCHAR *string)
     {
-        #if defined(UNICODE) || defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
-            QString retValue = QString::fromWCharArray(string);
+        #if (defined(UNICODE) || (defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T))) && !defined(_ASCII)
+            return str.toWCharArray(string);
+        #else
+            const QByteArray ba = str.toLocal8Bit();
+            strncpy(string, ba.constData(), ba.length());
+            return ba.length();
+        #endif
+    }
+
+    QString TCharToQString(const TCHAR *string, int size = -1)
+    {
+        #if (defined(UNICODE) || (defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T))) && !defined(_ASCII)
+            QString retValue = QString::fromWCharArray(string, size);
             return retValue;
         #else
-            return QString(QLatin1String(string));
+            return QString);
         #endif
     }