diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-09 01:38:11 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-10 00:49:43 +0300 |
| commit | 39aebda1ad31720139f7412ef89c8c2719133a25 (patch) | |
| tree | bf1d8121e07c62aea508042de36f8175edb5e6f6 /src/murmur/ServerUser.h | |
| parent | 69086d8572b43f60f3b3e1aa102fd116adccaa98 (diff) | |
Channel, ServerUser: make cast operator non-const.
Places that use the QString() conversion operator
for Channel and ServerUser sometimes end up using
the QString move constructor, which doesn't take
const strings.
Example of an error:
Messages.cpp:1055:65: error: no viable conversion from 'Channel' to 'QString'
log(uSource, QString("Renamed channel %1 to %2").arg(QString(*c),
Fixes C++11 build on OS X (clang/libc++).
Diffstat (limited to 'src/murmur/ServerUser.h')
| -rw-r--r-- | src/murmur/ServerUser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/murmur/ServerUser.h b/src/murmur/ServerUser.h index 220a98ef9..c75d86a7d 100644 --- a/src/murmur/ServerUser.h +++ b/src/murmur/ServerUser.h @@ -89,7 +89,7 @@ class ServerUser : public Connection, public User { public: enum State { Connected, Authenticated }; State sState; - operator const QString() const; + operator QString() const; float dUDPPingAvg, dUDPPingVar; float dTCPPingAvg, dTCPPingVar; |