Merge PR #2257: Various C++11 fixes

mumble-voip · May 9, 2016 · 7072cb2 · 7072cb2
2 parents 9b2bb22 + 39aebda
commit 7072cb2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/Channel.cpp b/src/Channel.cpp
@@ -191,7 +191,7 @@ void Channel::removeUser(User *p) {
 	qlUsers.removeAll(p);
 }
 
-Channel::operator const QString() const {
+Channel::operator QString() const {
 	return QString::fromLatin1("%1[%2:%3%4]").arg(qsName,
 	        QString::number(iId),
 	        QString::number(cParent ? cParent->iId : -1),

diff --git a/src/Channel.h b/src/Channel.h
@@ -108,7 +108,7 @@ class Channel : public QObject {
 		QSet<Channel *> allLinks();
 		QSet<Channel *> allChildren();
 
-		operator const QString() const;
+		operator QString() const;
 };
 
 #endif
diff --git a/src/mumble/GlobalShortcut_macx.mm b/src/mumble/GlobalShortcut_macx.mm
@@ -106,7 +106,7 @@
 			CGEventFlags f = CGEventGetFlags(event);
 
 			// Dump active event taps on Ctrl+Alt+Cmd.
-			CGEventFlags ctrlAltCmd = kCGEventFlagMaskControl|kCGEventFlagMaskAlternate|kCGEventFlagMaskCommand;
+			CGEventFlags ctrlAltCmd = static_cast<CGEventFlags>(kCGEventFlagMaskControl|kCGEventFlagMaskAlternate|kCGEventFlagMaskCommand);
 			if ((f & ctrlAltCmd) == ctrlAltCmd)
 				gs->dumpEventTaps();
 
@@ -146,7 +146,7 @@
 	return suppress ? NULL : event;
 }
 
-GlobalShortcutMac::GlobalShortcutMac() : modmask(0) {
+GlobalShortcutMac::GlobalShortcutMac() : modmask(static_cast<CGEventFlags>(0)) {
 #ifndef QT_NO_DEBUG
 	qWarning("GlobalShortcutMac: Debug build detected. Disabling shortcut engine.");
 	return;

diff --git a/src/murmur/ServerUser.cpp b/src/murmur/ServerUser.cpp
@@ -55,7 +55,7 @@ ServerUser::ServerUser(Server *p, QSslSocket *socket) : Connection(p, socket), U
 }
 
 
-ServerUser::operator const QString() const {
+ServerUser::operator QString() const {
 	return QString::fromLatin1("%1:%2(%3)").arg(qsName).arg(uiSession).arg(iId);
 }
 BandwidthRecord::BandwidthRecord() {

diff --git 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;