diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-12 14:08:42 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-12 14:08:52 +0900 |
| commit | 67bff2edcacb208dc44dcd521386bef686dc6dbf (patch) | |
| tree | 538584042585402a59d4b1464b117033778ccc28 /src/tools/qstring.cpp | |
| parent | fb401a891f1b426e9419c0cb16403df407138611 (diff) | |
| download | tqt3-67bff2edcacb208dc44dcd521386bef686dc6dbf.tar.gz tqt3-67bff2edcacb208dc44dcd521386bef686dc6dbf.zip | |
Replace Q_WS_* defines with TQ_WS_* equivalents
This is the first part of the replacement process.
Usage of Q_WS_* has been replaced with the equivalent TQ_WS_*.
Definition of Q_WS_* has been mirrored into TQ_WS_* defines, to allow
TDE code to continue building till replacement is carried over to all
other modules.
Once that is completed, the original Q_WS_* defines will
be removed.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/tools/qstring.cpp')
| -rw-r--r-- | src/tools/qstring.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 01d90c1f7..938ff3130 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -68,7 +68,7 @@ #ifndef Q_OS_TEMP #include <locale.h> #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) #include "qt_windows.h" #endif #if defined(Q_OS_LINUX) @@ -6261,23 +6261,23 @@ TQCString TQString::local8Bit() const *d->cString = TQCString(latin1()); return *d->cString; #else -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQTextCodec* codec = TQTextCodec::codecForLocale(); *d->cString = codec ? codec->fromUnicode(*this) : TQCString(latin1()); return *d->cString; #endif -#if defined( Q_WS_MACX ) +#if defined( TQ_WS_MACX ) return utf8(); #endif -#if defined( Q_WS_MAC9 ) +#if defined( TQ_WS_MAC9 ) *d->cString = TQCString(latin1()); //I'm evil.. return *d->cString; #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN *d->cString = isNull() ? TQCString("") : qt_winTQString2MB( *this ); return *d->cString; #endif -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS return utf8(); // ### if there is any 8 bit format supported? #endif #endif @@ -6307,7 +6307,7 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len ) if ( !local8Bit ) return TQString::null; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQTextCodec* codec = TQTextCodec::codecForLocale(); if ( len < 0 ) len = strlen( local8Bit ); @@ -6315,18 +6315,18 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len ) ? codec->toUnicode( local8Bit, len ) : fromLatin1( local8Bit, len ); #endif -#if defined( Q_WS_MAC ) +#if defined( TQ_WS_MAC ) return fromUtf8(local8Bit,len); #endif // Should this be OS_WIN32? -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if ( len >= 0 ) { TQCString s(local8Bit,len+1); return qt_winMB2TQString(s); } return qt_winMB2TQString( local8Bit ); #endif -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS return fromUtf8(local8Bit,len); #endif #endif // TQT_NO_TEXTCODEC @@ -6757,7 +6757,7 @@ int TQString::localeAwareCompare( const TQString& s ) const if ( isEmpty() || s.isEmpty() ) return compare( s ); -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) int res; QT_WA( { const TCHAR* s1 = (TCHAR*)ucs2(); @@ -6777,7 +6777,7 @@ int TQString::localeAwareCompare( const TQString& s ) const default: return 0; } -#elif defined(Q_WS_MACX) +#elif defined(TQ_WS_MACX) int delta = 0; #if !defined(TQT_NO_TEXTCODEC) TQTextCodec *codec = TQTextCodec::codecForLocale(); @@ -6787,7 +6787,7 @@ int TQString::localeAwareCompare( const TQString& s ) const #endif delta = ucstrcmp(*this, s); return delta; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) // declared in <string.h> int delta = strcoll( local8Bit(), s.local8Bit() ); if ( delta == 0 ) |