Skip to content

Commit d75455e

Browse files
author
Dimitri van Heesch
committed
Fixed compilation issue on Windows
1 parent 34b00c4 commit d75455e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

qtools/qstring.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11963,7 +11963,7 @@ QChar* QString::asciiToUnicode( const QByteArray& ba, uint* len )
1196311963
int l = 0;
1196411964
while ( l < (int)ba.size() && ba[l] )
1196511965
l++;
11966-
char* str = ba.data();
11966+
const char* str = ba.data();
1196711967
QChar *uc = new QChar[ l ]; // Can't use macro, since function is public
1196811968
QChar *result = uc;
1196911969
if ( len )
@@ -11982,7 +11982,7 @@ static QChar* internalAsciiToUnicode( const QByteArray& ba, uint* len )
1198211982
int l = 0;
1198311983
while ( l < (int)ba.size() && ba[l] )
1198411984
l++;
11985-
char* str = ba.data();
11985+
const char* str = ba.data();
1198611986
QChar *uc = QT_ALLOC_QCHAR_VEC( l );
1198711987
QChar *result = uc;
1198811988
if ( len )
@@ -15257,7 +15257,7 @@ QCString qt_winQString2MB( const QString& s, int uclen )
1525715257
QCString mb(bufSize);
1525815258
int len;
1525915259
while ( !(len=WideCharToMultiByte(CP_ACP, 0, (const WCHAR*)s.unicode(), uclen,
15260-
mb.data(), bufSize-1, 0, &used_def)) )
15260+
mb.rawData(), bufSize-1, 0, &used_def)) )
1526115261
{
1526215262
int r = GetLastError();
1526315263
if ( r == ERROR_INSUFFICIENT_BUFFER ) {

0 commit comments

Comments
 (0)