diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-15 18:49:06 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-16 10:46:31 +0900 |
| commit | 33c36fae2a0814715082a8fe59f208eeb018ed1d (patch) | |
| tree | 38b2cd06f694e03007946d28a6f31b65f661dfac /src/tools | |
| parent | 473cd1e8a525d82f49e936d76daabe3d094a8807 (diff) | |
| download | tqt-33c36fae2a0814715082a8fe59f208eeb018ed1d.tar.gz tqt-33c36fae2a0814715082a8fe59f208eeb018ed1d.zip | |
Replace QT_STATIC_CONST_* with actual definitions
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 1d318a47b0b45a7f916f526de60d628302cbfd4c)
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/ntqglobal.h | 13 | ||||
| -rw-r--r-- | src/tools/ntqstring.h | 12 | ||||
| -rw-r--r-- | src/tools/qstring.cpp | 12 |
3 files changed, 12 insertions, 25 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index edd27d431..1eb559919 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -681,19 +681,6 @@ const bool true = TRUE; // -// Workaround for static const members on MSVC++. -// - -#if defined(Q_CC_MSVC) -# define QT_STATIC_CONST static -# define QT_STATIC_CONST_IMPL -#else -# define QT_STATIC_CONST static const -# define QT_STATIC_CONST_IMPL const -#endif - - -// // Utility macros and inline functions // diff --git a/src/tools/ntqstring.h b/src/tools/ntqstring.h index e98aba40a..c2ef2a5eb 100644 --- a/src/tools/ntqstring.h +++ b/src/tools/ntqstring.h @@ -90,11 +90,11 @@ public: TQChar( uint rc ); TQChar( int rc ); - QT_STATIC_CONST TQChar null; // 0000 - QT_STATIC_CONST TQChar replacement; // FFFD - QT_STATIC_CONST TQChar byteOrderMark; // FEFF - QT_STATIC_CONST TQChar byteOrderSwapped; // FFFE - QT_STATIC_CONST TQChar nbsp; // 00A0 + static const TQChar null; // 0000 + static const TQChar replacement; // FFFD + static const TQChar byteOrderMark; // FEFF + static const TQChar byteOrderSwapped; // FFFE + static const TQChar nbsp; // 00A0 // Unicode information @@ -423,7 +423,7 @@ public: TQString &operator=( TQChar c ); TQString &operator=( char c ); - QT_STATIC_CONST TQString null; + static const TQString null; bool isNull() const; bool isEmpty() const; diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index cd42ea23c..e12c2344b 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -1457,12 +1457,12 @@ char* TQString::unicodeToLatin1(const TQChar *uc, uint l, bool unpaged) */ TQ_EXPORT TQStringData *TQString::shared_null = 0; -QT_STATIC_CONST_IMPL TQString TQString::null; -QT_STATIC_CONST_IMPL TQChar TQChar::null; -QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd); -QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderMark((ushort)0xfeff); -QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderSwapped((ushort)0xfffe); -QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0); +const TQString TQString::null; +const TQChar TQChar::null; +const TQChar TQChar::replacement((ushort)0xfffd); +const TQChar TQChar::byteOrderMark((ushort)0xfeff); +const TQChar TQChar::byteOrderSwapped((ushort)0xfffe); +const TQChar TQChar::nbsp((ushort)0x00a0); TQStringData* TQString::makeSharedNull() { |