diff options
Diffstat (limited to 'qtinterface/tqt4/Qt/qstring.h')
| -rw-r--r-- | qtinterface/tqt4/Qt/qstring.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/qtinterface/tqt4/Qt/qstring.h b/qtinterface/tqt4/Qt/qstring.h index bdb01db..9b6d650 100644 --- a/qtinterface/tqt4/Qt/qstring.h +++ b/qtinterface/tqt4/Qt/qstring.h @@ -50,7 +50,7 @@ #include <Qt3Support/q3cstring.h> #endif -#ifndef QT_NO_STL +#ifndef TQT_NO_STL # if defined (Q_CC_MSVC_NET) && _MSC_VER < 1310 // Avoids nasty warning for xlocale, line 450 # pragma warning (push) # pragma warning (disable : 4189) @@ -60,12 +60,12 @@ # include <string> # endif -# ifndef QT_NO_STL_WCHAR +# ifndef TQT_NO_STL_WCHAR // workaround for some headers not typedef'ing std::wstring typedef std::basic_string<wchar_t> QStdWString; -# endif // QT_NO_STL_WCHAR +# endif // TQT_NO_STL_WCHAR -#endif // QT_NO_STL +#endif // TQT_NO_STL #include <stdarg.h> @@ -476,17 +476,17 @@ public: inline void push_front(QChar c) { prepend(c); } inline void push_front(const QString &s) { prepend(s); } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL static inline QString fromStdString(const std::string &s); inline std::string toStdString() const; # ifdef qdoc static inline QString fromStdWString(const std::wstring &s); inline std::wstring toStdWString() const; # else -# ifndef QT_NO_STL_WCHAR +# ifndef TQT_NO_STL_WCHAR static inline QString fromStdWString(const QStdWString &s); inline QStdWString toStdWString() const; -# endif // QT_NO_STL_WCHAR +# endif // TQT_NO_STL_WCHAR # endif // qdoc #endif @@ -1031,14 +1031,14 @@ inline QT_ASCII_CAST_WARN const QString operator+(const QString &s, const QByteA # endif // QT_USE_FAST_CONCATENATION #endif // QT_USE_FAST_OPERATOR_PLUS -#ifndef QT_NO_STL +#ifndef TQT_NO_STL inline std::string QString::toStdString() const { const QByteArray asc = toAscii(); return std::string(asc.constData(), asc.length()); } inline QString QString::fromStdString(const std::string &s) { return fromAscii(s.data(), int(s.size())); } -# ifndef QT_NO_STL_WCHAR +# ifndef TQT_NO_STL_WCHAR inline QStdWString QString::toStdWString() const { QStdWString str; |