diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-08 14:11:35 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-11 20:38:52 +0100 |
| commit | 0b2190dad38cbe4c8245d500a0fc7cf6f69cc0da (patch) | |
| tree | a3f32e7be59234a07accd8bbedd8db435c99ae55 /src/corelib/tools/qstring.h | |
| parent | 6626b32b526438e9cf83cc45352f469d265a53cd (diff) | |
| download | qt4-tools-0b2190dad38cbe4c8245d500a0fc7cf6f69cc0da.tar.gz | |
remove qt_winQString2MB() and qt_winMB2QString()
absorb qt_winQString2MB() code directly into the QTextCodec code
Acked-by: thiago
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index a59c0bd945..ea12c2fd8a 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -1096,12 +1096,6 @@ Q_DECLARE_TYPEINFO(QString, Q_MOVABLE_TYPE); Q_DECLARE_SHARED(QString) Q_DECLARE_OPERATORS_FOR_FLAGS(QString::SectionFlags) -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) -extern Q_CORE_EXPORT QByteArray qt_winQString2MB(const QString& s, int len=-1); -extern Q_CORE_EXPORT QByteArray qt_winQString2MB(const QChar *ch, int len); -extern Q_CORE_EXPORT QString qt_winMB2QString(const char* mb, int len=-1); -#endif - class Q_CORE_EXPORT QStringRef { const QString *m_string; |