diff options
Diffstat (limited to 'src/tools/ntqstring.h')
-rw-r--r-- | src/tools/ntqstring.h | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/src/tools/ntqstring.h b/src/tools/ntqstring.h index 4c4c4173e..e98aba40a 100644 --- a/src/tools/ntqstring.h +++ b/src/tools/ntqstring.h @@ -78,7 +78,7 @@ class TQCharRef; class TQMutex; template <class T> class TQDeepCopy; -class Q_EXPORT TQChar { +class TQ_EXPORT TQChar { public: TQChar(); TQChar( char c ); @@ -363,7 +363,7 @@ inline bool operator>( char ch, TQChar c ) { return !(c>=ch); } inline bool operator>( TQChar c1, TQChar c2 ) { return !(c2>=c1); } // internal -struct Q_EXPORT TQStringData : public TQShared { +struct TQ_EXPORT TQStringData : public TQShared { TQStringData(); TQStringData(TQChar *u, uint l, uint m); ~TQStringData(); @@ -398,7 +398,7 @@ private: }; -class Q_EXPORT TQString +class TQ_EXPORT TQString { public: TQString(); // make null string @@ -687,7 +687,7 @@ public: { return s1.localeAwareCompare( s2 ); } #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); #endif void compose(); @@ -758,7 +758,7 @@ private: friend class TQLineEdit; }; -class Q_EXPORT TQCharRef { +class TQ_EXPORT TQCharRef { friend class TQString; TQString& s; uint p; @@ -818,7 +818,7 @@ inline TQCharRef TQString::at( uint i ) { return TQCharRef(this,i); } inline TQCharRef TQString::operator[]( int i ) { return at((uint)i); } -class Q_EXPORT TQConstString : private TQString { +class TQ_EXPORT TQConstString : private TQString { public: TQConstString( const TQChar* unicode, uint length ); ~TQConstString(); @@ -830,8 +830,8 @@ public: TQString stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); #endif /***************************************************************************** @@ -1000,28 +1000,28 @@ inline int TQString::findRev( const char* str, int index ) const TQString non-member operators *****************************************************************************/ -Q_EXPORT bool operator!=( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator<( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator<=( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator==( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator>( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator>=( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator!=( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator<( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator<=( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator==( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator>( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator>=( const TQString &s1, const TQString &s2 ); #ifndef TQT_NO_CAST_ASCII -Q_EXPORT bool operator!=( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator<( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator<=( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator==( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator>( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator>=( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator!=( const char *s1, const TQString &s2 ); -Q_EXPORT bool operator<( const char *s1, const TQString &s2 ); -Q_EXPORT bool operator<=( const char *s1, const TQString &s2 ); -Q_EXPORT bool operator==( const char *s1, const TQString &s2 ); -//Q_EXPORT bool operator>( const char *s1, const TQString &s2 ); // MSVC++ -Q_EXPORT bool operator>=( const char *s1, const TQString &s2 ); -#endif - -Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 ) +TQ_EXPORT bool operator!=( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator<( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator<=( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator==( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator>( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator>=( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator!=( const char *s1, const TQString &s2 ); +TQ_EXPORT bool operator<( const char *s1, const TQString &s2 ); +TQ_EXPORT bool operator<=( const char *s1, const TQString &s2 ); +TQ_EXPORT bool operator==( const char *s1, const TQString &s2 ); +//TQ_EXPORT bool operator>( const char *s1, const TQString &s2 ); // MSVC++ +TQ_EXPORT bool operator>=( const char *s1, const TQString &s2 ); +#endif + +TQ_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 ) { TQString tmp( s1 ); tmp += s2; @@ -1029,14 +1029,14 @@ Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 } #ifndef TQT_NO_CAST_ASCII -Q_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 ) +TQ_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 ) { TQString tmp( s1 ); tmp += TQString::fromAscii(s2); return tmp; } -Q_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 ) +TQ_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 ) { TQString tmp = TQString::fromAscii( s1 ); tmp += s2; @@ -1044,21 +1044,21 @@ Q_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 ) } #endif -Q_EXPORT inline const TQString operator+( const TQString &s1, TQChar c2 ) +TQ_EXPORT inline const TQString operator+( const TQString &s1, TQChar c2 ) { TQString tmp( s1 ); tmp += c2; return tmp; } -Q_EXPORT inline const TQString operator+( const TQString &s1, char c2 ) +TQ_EXPORT inline const TQString operator+( const TQString &s1, char c2 ) { TQString tmp( s1 ); tmp += c2; return tmp; } -Q_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 ) +TQ_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 ) { TQString tmp; tmp += c1; @@ -1066,7 +1066,7 @@ Q_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 ) return tmp; } -Q_EXPORT inline const TQString operator+( char c1, const TQString &s2 ) +TQ_EXPORT inline const TQString operator+( char c1, const TQString &s2 ) { TQString tmp; tmp += c1; @@ -1075,12 +1075,12 @@ Q_EXPORT inline const TQString operator+( char c1, const TQString &s2 ) } #ifndef TQT_NO_STL -Q_EXPORT inline const TQString operator+(const TQString& s1, const std::string& s2) +TQ_EXPORT inline const TQString operator+(const TQString& s1, const std::string& s2) { return s1 + TQString(s2); } -Q_EXPORT inline const TQString operator+(const std::string& s1, const TQString& s2) +TQ_EXPORT inline const TQString operator+(const std::string& s1, const TQString& s2) { TQString tmp(s2); return TQString(tmp.prepend(s1)); @@ -1089,11 +1089,11 @@ Q_EXPORT inline const TQString operator+(const std::string& s1, const TQString& #if defined(Q_OS_WIN32) -extern Q_EXPORT TQString qt_winTQString(void*); -extern Q_EXPORT const void* qt_winTchar(const TQString& str, bool addnul); -extern Q_EXPORT void* qt_winTchar_new(const TQString& str); -extern Q_EXPORT TQCString qt_winTQString2MB( const TQString& s, int len=-1 ); -extern Q_EXPORT TQString qt_winMB2TQString( const char* mb, int len=-1 ); +extern TQ_EXPORT TQString qt_winTQString(void*); +extern TQ_EXPORT const void* qt_winTchar(const TQString& str, bool addnul); +extern TQ_EXPORT void* qt_winTchar_new(const TQString& str); +extern TQ_EXPORT TQCString qt_winTQString2MB( const TQString& s, int len=-1 ); +extern TQ_EXPORT TQString qt_winMB2TQString( const char* mb, int len=-1 ); #endif #define Q_DEFINED_QSTRING |