diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-05-07 18:37:16 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-05-20 13:44:28 (GMT) |
| commit | e5d3dcc188439321e129406cb14a51e60a19b727 (patch) | |
| tree | 1566e28a285d62f1b1aa4ce9881d711538886f07 /src/qt3support/text | |
| parent | f274db8040546e54b1ef0e674d9733714c68d4d5 (diff) | |
| download | Qt-e5d3dcc188439321e129406cb14a51e60a19b727.zip Qt-e5d3dcc188439321e129406cb14a51e60a19b727.tar.gz Qt-e5d3dcc188439321e129406cb14a51e60a19b727.tar.bz2 | |
Qt3 Support headers: Avoid warnings from mingw g++
q3textstream.h and q3cstring.h include some functions declared
Q_COMPAT_EXPORT inline, which doesn’t make much sense. It probably
makes sense to keep exporting them for backward compatibility, but there
is no reason to import them, as gcc notices:
q3cstring.h:164: warning: inline function 'bool operator==(const
Q3CString&, const Q3CString&)' declared as dllimport: attribute
ignored
This is analogous to the case of Q_GUI_EXPORT_INLINE, which is already
handled in qglobal.h.
Reviewed-By: Thierry
Diffstat (limited to 'src/qt3support/text')
| -rw-r--r-- | src/qt3support/text/q3textstream.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt3support/text/q3textstream.h b/src/qt3support/text/q3textstream.h index d0c4f48..0e26e08 100644 --- a/src/qt3support/text/q3textstream.h +++ b/src/qt3support/text/q3textstream.h @@ -272,13 +272,13 @@ private: int arg; // member function argument }; -Q_COMPAT_EXPORT inline Q3TextStream &operator>>( Q3TextStream &s, Q3TSFUNC f ) +Q_COMPAT_EXPORT_INLINE Q3TextStream &operator>>( Q3TextStream &s, Q3TSFUNC f ) { return (*f)( s ); } -Q_COMPAT_EXPORT inline Q3TextStream &operator<<( Q3TextStream &s, Q3TSFUNC f ) +Q_COMPAT_EXPORT_INLINE Q3TextStream &operator<<( Q3TextStream &s, Q3TSFUNC f ) { return (*f)( s ); } -Q_COMPAT_EXPORT inline Q3TextStream &operator<<( Q3TextStream &s, Q3TSManip m ) +Q_COMPAT_EXPORT_INLINE Q3TextStream &operator<<( Q3TextStream &s, Q3TSManip m ) { m.exec(s); return s; } Q_COMPAT_EXPORT Q3TextStream &bin( Q3TextStream &s ); // set bin notation |