src/sql/drivers/db2/qsql_db2.cpp
changeset 30 5dc02b23752f
parent 18 2f34d5167611
equal deleted inserted replaced
29:b72c6db6890b 30:5dc02b23752f
   107     QVector<QVariant*> valueCache;
   107     QVector<QVariant*> valueCache;
   108 };
   108 };
   109 
   109 
   110 static QString qFromTChar(SQLTCHAR* str)
   110 static QString qFromTChar(SQLTCHAR* str)
   111 {
   111 {
   112     return QString::fromUtf16(str);
   112     return QString((const QChar *)str);
   113 }
   113 }
   114 
   114 
   115 // dangerous!! (but fast). Don't use in functions that
   115 // dangerous!! (but fast). Don't use in functions that
   116 // require out parameters!
   116 // require out parameters!
   117 static SQLTCHAR* qToTChar(const QString& str)
   117 static SQLTCHAR* qToTChar(const QString& str)
   831             case QVariant::Double:
   831             case QVariant::Double:
   832             case QVariant::ByteArray:
   832             case QVariant::ByteArray:
   833                 break;
   833                 break;
   834             case QVariant::String:
   834             case QVariant::String:
   835                 if (bindValueType(i) & QSql::Out)
   835                 if (bindValueType(i) & QSql::Out)
   836                     values[i] = QString::fromUtf16((ushort*)tmpStorage.takeFirst().constData());
   836                     values[i] = QString((const QChar *)tmpStorage.takeFirst().constData());
   837                 break;
   837                 break;
   838             default: {
   838             default: {
   839                 values[i] = QString::fromAscii(tmpStorage.takeFirst().constData());
   839                 values[i] = QString::fromAscii(tmpStorage.takeFirst().constData());
   840                 break; }
   840                 break; }
   841         }
   841         }