diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-01-03 13:11:13 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-01-03 13:11:13 (GMT) |
| commit | d75455eef7c91f11c2b9061d9a086ce93c4231b2 (patch) | |
| tree | 6e12921145f5a6ed5eaf85bb5a6df4922bf08ac3 /qtools | |
| parent | 34b00c442308efe169cc89fad62588fdce1d84e8 (diff) | |
| download | Doxygen-d75455eef7c91f11c2b9061d9a086ce93c4231b2.zip Doxygen-d75455eef7c91f11c2b9061d9a086ce93c4231b2.tar.gz Doxygen-d75455eef7c91f11c2b9061d9a086ce93c4231b2.tar.bz2 | |
Fixed compilation issue on Windows
Diffstat (limited to 'qtools')
| -rw-r--r-- | qtools/qstring.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qtools/qstring.cpp b/qtools/qstring.cpp index 3673c20..f51c0d4 100644 --- a/qtools/qstring.cpp +++ b/qtools/qstring.cpp @@ -11963,7 +11963,7 @@ QChar* QString::asciiToUnicode( const QByteArray& ba, uint* len ) int l = 0; while ( l < (int)ba.size() && ba[l] ) l++; - char* str = ba.data(); + const char* str = ba.data(); QChar *uc = new QChar[ l ]; // Can't use macro, since function is public QChar *result = uc; if ( len ) @@ -11982,7 +11982,7 @@ static QChar* internalAsciiToUnicode( const QByteArray& ba, uint* len ) int l = 0; while ( l < (int)ba.size() && ba[l] ) l++; - char* str = ba.data(); + const char* str = ba.data(); QChar *uc = QT_ALLOC_QCHAR_VEC( l ); QChar *result = uc; if ( len ) @@ -15257,7 +15257,7 @@ QCString qt_winQString2MB( const QString& s, int uclen ) QCString mb(bufSize); int len; while ( !(len=WideCharToMultiByte(CP_ACP, 0, (const WCHAR*)s.unicode(), uclen, - mb.data(), bufSize-1, 0, &used_def)) ) + mb.rawData(), bufSize-1, 0, &used_def)) ) { int r = GetLastError(); if ( r == ERROR_INSUFFICIENT_BUFFER ) { |